diff --git a/install.sh b/install.sh index 0647bc4..db56956 100755 --- a/install.sh +++ b/install.sh @@ -72,8 +72,8 @@ dap_dl_bash() { dap_url=$1 #dap_args=$2 - rm -rf dap-tmp-runner.sh - $http_bin $http_opts $http_out dap-tmp-runner.sh "$dap_url"; bash dap-tmp-runner.sh; rm dap-tmp-runner.sh + rm -rf /tmp/dap-tmp-runner.sh + $http_bin $http_opts $http_out /tmp/dap-tmp-runner.sh "$dap_url"; bash /tmp/dap-tmp-runner.sh; rm /tmp/dap-tmp-runner.sh } detect_http_bin @@ -149,6 +149,7 @@ install_etc_config() install_service() { + echo "install etc config" install_etc_config installable="" @@ -185,6 +186,7 @@ create_skeleton() # Unistall install_uninstaller() { + echo "install uninstaller" dap_dl "https://git.daplie.com/Daplie/walnut.js/raw/master/uninstall.sh" "./walnut-uninstall" $sudo_cmd chmod 755 "./walnut-uninstall" $sudo_cmd chown root:root "./walnut-uninstall" @@ -220,21 +222,20 @@ install_my_app() sudo mkdir -p /srv/walnut/etc/org.oauth3.consumer sudo mkdir -p /srv/walnut/etc/org.oauth3.provider sudo mkdir -p /srv/walnut/packages/{client-api-grants,rest,api,pages,services,sites} - #sudo chown -R $(whoami):$(whoami) /srv/walnut - sudo chown -R www-data:www-data /srv/walnut || true - sudo chown -R _www:_www /srv/walnut || true - sudo chmod -R ug+Xrw /srv/walnut pushd /srv/walnut/core - sudo chown -R $(whoami) /srv/walnut - #sudo --user www-data --group www-data npm install npm install - sudo chown -R www-data /srv/walnut || true - sudo chown -R _www /srv/walnut || true popd } +sudo mkdir -p /srv/walnut +sudo chown -R $(whoami) /srv/walnut + install_my_app create_skeleton install_uninstaller install_service + +sudo chown -R www-data:www-data /srv/walnut || true +sudo chown -R _www:_www /srv/walnut || true +sudo chmod -R ug+Xrw /srv/walnut