Fix case where user is root

In this case, /home/root/... path doesn't exist, so we use a hacky way
to get the scripts' path.

diff --git a/arch-scripts/grep_xseg.sh b/arch-scripts/grep_xseg.sh
index 082cc8f..194c3ff 100755 (executable)
--- a/arch-scripts/grep_xseg.sh
+++ b/arch-scripts/grep_xseg.sh
@@ -6,8 +6,11 @@
 
 set -e #exit on error
 
+# Find script location
+ARCH_SCRIPTS=$(dirname "$(readlink /proc/$$/fd/255)")
+
 #Include basic functions
-source /home/$(logname)/archipelago/arch-scripts/init.sh
+source $ARCH_SCRIPTS/init.sh
 
 SED_XSEG=$(echo "${XSEG}/" | sed 's/\//\\\//g')
 INCLUDE="--include=*.c --include=*.h"

diff --git a/arch-scripts/init.sh b/arch-scripts/init.sh
index 2088987..7a66d19 100644 (file)
--- a/arch-scripts/init.sh
+++ b/arch-scripts/init.sh
@@ -16,5 +16,6 @@ grn_echo(){
        echo -e "${txtgrn}${1}${txtrst}"
 }
 
-XSEG=/home/$(logname)/archipelago/xseg
+#ARCH_SCRIPTS must be already set by the caller function
+XSEG=$ARCH_SCRIPTS/../xseg
 

diff --git a/arch-scripts/make_xseg.sh b/arch-scripts/make_xseg.sh
index 8a12c60..ec48a61 100755 (executable)
--- a/arch-scripts/make_xseg.sh
+++ b/arch-scripts/make_xseg.sh
@@ -6,8 +6,11 @@
 
 set -e  #exit on error
 
+# Find script location
+ARCH_SCRIPTS=$(dirname "$(readlink /proc/$$/fd/255)")
+
 #Include basic functions
-source /home/$(logname)/archipelago/arch-scripts/init.sh
+source $ARCH_SCRIPTS/init.sh
 
 PIPE="1>/dev/null"