From a17f7d52ba020b548e1764c5056407702d85198e Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 16:03:27 -0700 Subject: [PATCH 1/3] fix instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 885e6d7..739a36e 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ curl -fsSL https://git.daplie.com/Daplie/goldilocks.js/raw/v1.1/installer/get.sh ```bash git clone https://git.daplie.com/Daplie/goldilocks.js -git checkout v1.1 pushd goldilocks.js +git checkout v1.1 bash installer/install.sh ``` From 0e1437bcd7a14384ceda46995ec3e0e79eb4b445 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 16:05:14 -0700 Subject: [PATCH 2/3] fix dirname expansion --- installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/install.sh b/installer/install.sh index 7f8086e..df0eff4 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -125,7 +125,7 @@ $sudo_cmd chown root:root $my_tmp # don't even read $my_tmp/ # don't change permissions on /, /etc, etc for my_dir in $my_tmp/*; do - rsync -a --ignore-existing $my_tmp/$my_dir/ $my_root/$my_dir/ + rsync -a --ignore-existing $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 source ./installer/install-system-service.sh From 4ffad8d3c361811c282f6262b107fe28c248a741 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 16:06:43 -0700 Subject: [PATCH 3/3] fix dirname expansion --- installer/install.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/installer/install.sh b/installer/install.sh index df0eff4..5d7dc64 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -122,11 +122,8 @@ echo "User $my_user Group $my_group" $sudo_cmd chown -R $my_user:$my_group $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 -for my_dir in $my_tmp/*; do - rsync -a --ignore-existing $my_dir/ $my_root/$my_dir/ -done +rsync -a --ignore-existing $my_tmp/ $my_root/ 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