diff --git a/install.sh b/install.sh index 8c73d0b..4a44cc3 100644 --- a/install.sh +++ b/install.sh @@ -95,14 +95,15 @@ popd # System Service # source ./installer/my-root.sh -echo "Pre-installation to $my_app_dir complete, now installing to $my_root/" +echo "Pre-installation to $my_app_dir complete, now installing to $my_root/ ..." +ls $my_app_dir source ./installer/my-user-my-group.sh echo "User $my_user Group $my_group" $sudo_cmd chown -R $my_user:$my_group $my_app_dir -rsync -av $my_app_dir/ $my_root/ -rsync -av --ignore-existing $my_app_dist/etc/goldilocks/goldilocks.yml $my_root/etc/goldilocks/goldilocks.yml +rsync -a $my_app_dir/ $my_root/ +rsync -a --ignore-existing $my_app_dist/etc/goldilocks/goldilocks.yml $my_root/etc/goldilocks/goldilocks.yml source ./installer/install-system-service.sh # Change to admin perms diff --git a/installer/install-system-service.sh b/installer/install-system-service.sh index 26f3929..a0af5d0 100644 --- a/installer/install-system-service.sh +++ b/installer/install-system-service.sh @@ -4,7 +4,7 @@ safe_copy_config() dst=$2 $sudo_cmd mkdir -p $(dirname "$dst") if [ -f "$dst" ]; then - $sudo_cmd rsync -av "$src" "$dst.latest" + $sudo_cmd rsync -a "$src" "$dst.latest" # TODO edit config file with $my_user and $my_group if [ "$(cat $dst)" == "$(cat $dst.latest)" ]; then $sudo_cmd rm $dst.latest @@ -14,7 +14,7 @@ safe_copy_config() $sudo_cmd chown -R root:root "$dst.latest" fi else - $sudo_cmd rsync -av --ignore-existing "$src" "$dst" + $sudo_cmd rsync -a --ignore-existing "$src" "$dst" fi $sudo_cmd chown -R root:root "$dst" $sudo_cmd chmod 644 "$dst"