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

[__git] Make shellcheck happy :-)

Browse source
This commit is contained in:
evilham 2020-06-18 00:50:31 +02:00
parent a40025d842
commit 376fab8a66
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/conf/type/__git/explorer/branch
View file

@ -2,7 +2,6 @@
destination="/$__object_id" destination="/$__object_id"
os="$(cat "$__global/explorer/os")"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
owner="$(cat "$__object/parameter/owner")" owner="$(cat "$__object/parameter/owner")"
@ -14,7 +13,7 @@ if [ "$state_should" = "present" ] && [ -d "$destination/.git" ]; then
# Whenever possible run git as non-root, see history of CVEs. # Whenever possible run git as non-root, see history of CVEs.
branch="$(su -m "$git_user" -c "git -C '$destination' rev-parse --abbrev-ref HEAD")" branch="$(su -m "$git_user" -c "git -C '$destination' rev-parse --abbrev-ref HEAD")"
if [ "$branch" != "HEAD" ]; then if [ "$branch" != "HEAD" ]; then
echo $branch echo "$branch"
else else
# We are using tags # We are using tags
su -m "$git_user" -c "git -C '$destination' describe --always --tags --abbrev=0" su -m "$git_user" -c "git -C '$destination' describe --always --tags --abbrev=0"

1
cdist/conf/type/__git/explorer/needs-update
View file

@ -2,7 +2,6 @@
destination="/$__object_id" destination="/$__object_id"
os="$(cat "$__global/explorer/os")"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
branch_should="$(cat "$__object/parameter/branch")" branch_should="$(cat "$__object/parameter/branch")"
owner="$(cat "$__object/parameter/owner")" owner="$(cat "$__object/parameter/owner")"