Merge branch 'v1.1'

This commit is contained in:
AJ ONeal 2017-11-07 16:08:34 -07:00
commit 0a233cfcf0
2 changed files with 2 additions and 5 deletions

View File

@ -30,8 +30,8 @@ curl -fsSL https://git.daplie.com/Daplie/goldilocks.js/raw/v1.1/installer/get.sh
```bash ```bash
git clone https://git.daplie.com/Daplie/goldilocks.js git clone https://git.daplie.com/Daplie/goldilocks.js
git checkout v1.1
pushd goldilocks.js pushd goldilocks.js
git checkout v1.1
bash installer/install.sh bash installer/install.sh
``` ```

View File

@ -122,11 +122,8 @@ echo "User $my_user Group $my_group"
$sudo_cmd chown -R $my_user:$my_group $my_tmp/* $sudo_cmd chown -R $my_user:$my_group $my_tmp/*
$sudo_cmd chown root:root $my_tmp/* $sudo_cmd chown root:root $my_tmp/*
$sudo_cmd chown root:root $my_tmp $sudo_cmd chown root:root $my_tmp
# don't even read $my_tmp/
# don't change permissions on /, /etc, etc # don't change permissions on /, /etc, etc
for my_dir in $my_tmp/*; do rsync -a --ignore-existing $my_tmp/ $my_root/
rsync -a --ignore-existing $my_tmp/$my_dir/ $my_root/$my_dir/
done
rsync -a --ignore-existing $my_app_dist/etc/$my_name/$my_name.yml $my_root/etc/$my_name/$my_name.yml rsync -a --ignore-existing $my_app_dist/etc/$my_name/$my_name.yml $my_root/etc/$my_name/$my_name.yml
source ./installer/install-system-service.sh source ./installer/install-system-service.sh