andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ungleich/cdist

Browse source
This commit is contained in:
Nico Schottelius 2019-04-15 16:20:31 +02:00
commit c7a9e60de0
6 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -43,6 +43,7 @@ _build/
docs/dist docs/dist
# Ignore temp files used for signing # Ignore temp files used for signing
cdist-*.tar
cdist-*.tar.gz cdist-*.tar.gz
cdist-*.tar.gz.asc cdist-*.tar.gz.asc

5
bin/build-helper
View file

@ -200,7 +200,10 @@ eof
|| exit 1 || exit 1
# make sure target version is generated # make sure target version is generated
"$0" target-version "$0" target-version
tar -r -f "${archivename}" cdist/version.py || exit 1 tar -x -f "${archivename}" || exit 1
cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
rm -r -f "cdist-${tag}/"
gzip "${archivename}" || exit 1 gzip "${archivename}" || exit 1
archivename="${archivename}.gz" archivename="${archivename}.gz"
fi fi

5
bin/build-helper.freebsd
View file

@ -235,7 +235,10 @@ eof
|| exit 1 || exit 1
# make sure target version is generated # make sure target version is generated
"$0" target-version "$0" target-version
tar -r -f "${archivename}" cdist/version.py || exit 1 tar -x -f "${archivename}" || exit 1
cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
rm -r -f "cdist-${tag}/"
gzip "${archivename}" || exit 1 gzip "${archivename}" || exit 1
archivename="${archivename}.gz" archivename="${archivename}.gz"
fi fi

16
cdist/conf/type/__directory/explorer/stat
View file

@ -25,20 +25,12 @@ destination="/$__object_id"
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
"freebsd"|"netbsd"|"openbsd") "freebsd"|"netbsd"|"openbsd"|"macosx")
# FIXME: should be something like this based on man page, but can not test stat -f "type: %HT
stat -f "type: %ST
owner: %Du %Su owner: %Du %Su
group: %Dg %Sg group: %Dg %Sg
mode: %Op %Sp mode: %Lp %Sp
" "$destination" " "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
;;
"macosx")
stat -f "type: %HT
owner: %Du %Su
group: %Dg %Sg
mode: %Lp %Sp
" "$destination"
;; ;;
*) *)
stat --printf="type: %F stat --printf="type: %F

14
cdist/conf/type/__file/explorer/stat
View file

@ -25,24 +25,14 @@ destination="/$__object_id"
os=$("$__explorer/os") os=$("$__explorer/os")
case "$os" in case "$os" in
"freebsd"|"netbsd"|"openbsd") "freebsd"|"netbsd"|"openbsd"|"macosx")
# FIXME: should be something like this based on man page, but can not test
stat -f "type: %ST
owner: %Du %Su
group: %Dg %Sg
mode: %Op %Sp
size: %Dz
links: %Dl
" "$destination"
;;
"macosx")
stat -f "type: %HT stat -f "type: %HT
owner: %Du %Su owner: %Du %Su
group: %Dg %Sg group: %Dg %Sg
mode: %Lp %Sp mode: %Lp %Sp
size: %Dz size: %Dz
links: %Dl links: %Dl
" "$destination" " "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
;; ;;
*) *)
stat --printf="type: %F stat --printf="type: %F

8
docs/changelog
View file

@ -2,11 +2,15 @@ Changelog
--------- ---------
next: next:
* Type __package: Add __package_apk support (Nico Schottelius)
* New type: __package_apk (Nico Schottelius)
4.10.11: 2019-04-13
* Core: Fix broken quiet mode (Darko Poljak) * Core: Fix broken quiet mode (Darko Poljak)
* Build: Add version.py into generated raw source archive (Darko Poljak) * Build: Add version.py into generated raw source archive (Darko Poljak)
* Explorer disks: Fix detecting disks, fix/add support for BSDs (Ander Punnar) * Explorer disks: Fix detecting disks, fix/add support for BSDs (Ander Punnar)
* Type __package: Add __package_apk support (Nico Schottelius) * Type __file: Fix stat explorer for BSDs (Ander Punnar)
* New type: __package_apk (Nico Schottelius) * Type __directory: Fix stat explorer for BSDs (Ander Punnar)
4.10.10: 2019-04-11 4.10.10: 2019-04-11
* New types: __ufw and __ufw_rule (Mark Polyakov) * New types: __ufw and __ufw_rule (Mark Polyakov)