diff options
| author | Simon Rettberg | 2016-09-09 10:25:53 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-09 10:25:53 +0200 |
| commit | 83dd99152bb8aa38d726d49769008f73e5b9a05d (patch) | |
| tree | 3d10226063403e0064d92b9f9433ac06b619a568 /satellit_upgrader/updater.template.sh | |
| parent | [SSPS/SSUS] Modules bootstrap_dialog, js_jqueryui added (diff) | |
| download | setup-scripts-83dd99152bb8aa38d726d49769008f73e5b9a05d.tar.gz setup-scripts-83dd99152bb8aa38d726d49769008f73e5b9a05d.tar.xz setup-scripts-83dd99152bb8aa38d726d49769008f73e5b9a05d.zip | |
[SSUS] A function should do what its name says (plus the code was pointless anyways because it checked for existence the line before)
Diffstat (limited to 'satellit_upgrader/updater.template.sh')
| -rw-r--r-- | satellit_upgrader/updater.template.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index ebab457..93cafc3 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -68,10 +68,8 @@ restart_service () { } # ** Recursively set permissions of given directory to 0755/0644 optionally setting owner/group -# ** If directory is not there it will be mkdir'ed. fixperms () { [ -e "$1" ] || perror "normalize_perms: $1 does not exist" - [ -d "$1" ] || mkdir -p "$1" chmod -R a-rw,u+rwX,go+rX "$1" if [ -n "$2" ]; then chown -R "$2" "$1" || pwarning "Could not change owner of $1 to $2" @@ -231,7 +229,7 @@ if [ -n "$TGZ_SLXADMIN" ]; then ln -s -f "$PATH_TFTP" "/srv/openslx/www/tftp" || perror "Could not symlink $PATH_TFTP to /srv/openslx/www/tftp" echo "Web interface upgrade complete" fixperms "${PATH_SLXADMINCACHE}" www-data:www-data - + if [ -h "${PATH_SLXADMINCACHE}/baseconfig-bwidm_settings.json" ]; then pwarning "There is already a link or file /srv/openslx/www/slx-admin/modules-available/baseconfig_bwidm/baseconfig/settings.json. Please check manually, it should lead to /srv/openslx/www/slx-admin/modules-available/baseconfig_bwidm/baseconfig/settings.json" else |