diff --git a/installer/install.sh b/installer/install.sh index 3a338ab..4568269 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -69,9 +69,8 @@ pushd $my_tmp/opt/$my_app_name/core # # Helpers # - installer_prefix="." - source ./$installer_prefix/sudo-cmd.sh - source ./$installer_prefix/http-get.sh + source ./installer/sudo-cmd.sh + source ./installer/http-get.sh @@ -132,7 +131,7 @@ pushd $my_tmp/opt/$my_app_name/core # # System Service # - source ./$installer_prefix/my-root.sh + source ./installer/my-root.sh echo "Pre-installation to $my_tmp complete, now installing to $my_root/ ..." set +e if type -p tree >/dev/null 2>/dev/null; then @@ -143,13 +142,13 @@ pushd $my_tmp/opt/$my_app_name/core fi set -e - source ./$installer_prefix/my-user-my-group.sh + source ./installer/my-user-my-group.sh echo "User $my_user Group $my_group" $sudo_cmd chown -R $my_user:$my_group $my_tmp rsync -a $my_tmp/ $my_root/ rsync -a --ignore-existing $my_app_dist/etc/$my_app_name/$my_app_name.yml $my_root/etc/$my_app_name/$my_app_name.yml - source ./$installer_prefix/install-system-service.sh + source ./installer/install-system-service.sh # Change to admin perms $sudo_cmd chown -R $my_user:$my_group $my_root/opt/$my_app_name