From 5bd1d996dc148eb7e8c50ca8defb47ed9a3e8565 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Fri, 25 Sep 2020 16:27:03 +0930 Subject: [PATCH] fix: ensure we have the cwd set correctly and add start-debug --- dynamix.unraid.net.plg | 30 +++++++++++++++++++++--------- index.js | 1 + 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dynamix.unraid.net.plg b/dynamix.unraid.net.plg index 7f4180ab8..38dbea40b 100644 --- a/dynamix.unraid.net.plg +++ b/dynamix.unraid.net.plg @@ -53,7 +53,7 @@ fi # unraid-api-handler downloads=(graphql-api plugins) mode="production" -base_directory="/usr/local/bin" +base_directory="/usr/local/bin/node" if [[ $* == *--mode\=dev* ]]; then mode="development" fi @@ -67,30 +67,39 @@ status() { } version() { # Borrowed from https://gist.github.com/DarrenN/8c6a5b969481725a4413 - local graphql_version=$(grep '"version"' $base_directory/node/graphql-api/package.json | cut -d '"' -f 4) - local plugins_version=$(grep '"version"' $base_directory/node/plugins/package.json | cut -d '"' -f 4) + local graphql_version=$(grep '"version"' $base_directory/graphql-api/package.json | cut -d '"' -f 4) + local plugins_version=$(grep '"version"' $base_directory/plugins/package.json | cut -d '"' -f 4) echo "Graphql-api v$graphql_version" echo "Official plugins v$plugins_version" } start() { - pm2 startOrRestart $base_directory/node/graphql-api/ecosystem.config.js --env=$(echo $mode) --no-daemon &> /dev/null & + old_working_directory=$(echo $pwd) + cd $base_directory + pm2 startOrRestart $base_directory/graphql-api/ecosystem.config.js --env=$(echo $mode) --no-daemon &> /dev/null & + cd $old_working_directory exit 0 } +startdebug() { + old_working_directory=$(echo $pwd) + cd $base_directory + pm2 startOrRestart $base_directory/graphql-api/ecosystem.config.js --env=debug --no-daemon + cd $old_working_directory +} stop() { pm2 kill &> /dev/null exit 0 } reload() { - pm2 startOrRestart $base_directory/node/graphql-api/ecosystem.config.js --env=$(echo $mode) --no-daemon &> /dev/null & + pm2 startOrRestart $base_directory/graphql-api/ecosystem.config.js --env=$(echo $mode) --no-daemon &> /dev/null & exit 0 } install() { pm2 kill &> /dev/null for download in ${downloads[@]}; do - rm -rf $base_directory/node/${download} - mkdir -p $base_directory/node/${download} - tar -C $base_directory/node/${download} -xzf /boot/config/plugins/Unraid.net/unraid-${download}.tgz --strip 1 + rm -rf $base_directory/${download} + mkdir -p $base_directory/${download} + tar -C $base_directory/${download} -xzf /boot/config/plugins/Unraid.net/unraid-${download}.tgz --strip 1 done start } @@ -98,7 +107,7 @@ uninstall() { stop sleep 1 for download in ${downloads[@]}; do - rm -rf $base_directory/node/${download} + rm -rf $base_directory/${download} done rm -f /var/run/graphql-api.sock } @@ -112,6 +121,9 @@ case "$1" in 'start') start ;; +'start-debug') + startdebug + ;; 'stop') stop ;; diff --git a/index.js b/index.js index 868380a71..32b1b563a 100644 --- a/index.js +++ b/index.js @@ -5,4 +5,5 @@ try { }); } catch {} +process.chdir(__dirname); require('./dist/index'); \ No newline at end of file