diff --git a/cdist/conf/type/__git/explorer/branch b/cdist/conf/type/__git/explorer/branch index 483edb2a..21c01dc7 100755 --- a/cdist/conf/type/__git/explorer/branch +++ b/cdist/conf/type/__git/explorer/branch @@ -2,7 +2,6 @@ destination="/$__object_id" -os="$(cat "$__global/explorer/os")" state_should="$(cat "$__object/parameter/state")" 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. branch="$(su -m "$git_user" -c "git -C '$destination' rev-parse --abbrev-ref HEAD")" if [ "$branch" != "HEAD" ]; then - echo $branch + echo "$branch" else # We are using tags su -m "$git_user" -c "git -C '$destination' describe --always --tags --abbrev=0" diff --git a/cdist/conf/type/__git/explorer/needs-update b/cdist/conf/type/__git/explorer/needs-update index d055b794..2c316683 100755 --- a/cdist/conf/type/__git/explorer/needs-update +++ b/cdist/conf/type/__git/explorer/needs-update @@ -2,7 +2,6 @@ destination="/$__object_id" -os="$(cat "$__global/explorer/os")" state_should="$(cat "$__object/parameter/state")" branch_should="$(cat "$__object/parameter/branch")" owner="$(cat "$__object/parameter/owner")"