Standardize PROG_NAME and PROG_PATH

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>

diff --git a/scripts/hv-scan b/scripts/hv-scan
index cca5d58f59fe805f8cea4bfb69575c2fdb84cbc5..26ddf4f5a83d65aacef5d293328eaf99a655f04b 100755 (executable)
--- a/scripts/hv-scan
+++ b/scripts/hv-scan
@@ -2,13 +2,14 @@
 
 # Numérisation d'un document texte, et conversion en PDF
 
+PROG_NAME="`readlink -e $0`"
+
 jpeg_quality=10
 color_mode="Gray"
 resolution="200"
 extension="pdf"
 scan_area="--scan-area Letter"
 resize_pdf="-page Letter"
-PROG_NAME=$(basename $0)
 
 print_usage()
 {

diff --git a/scripts/hvk-common.sh b/scripts/hvk-common.sh
index 1310cf6e60dcc9f33b24b9d49f15e89af5a4e5cd..2796a6d9dceed3611fbd39e11aa6e64b04124993 100644 (file)
--- a/scripts/hvk-common.sh
+++ b/scripts/hvk-common.sh
@@ -3,6 +3,9 @@
 # Abort on errors
 set -e
 
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+
 if [ -f include/linux/linux_logo.h ]; then
     mode=linux
 elif [ -f include/asm-generic/u-boot.h ]; then
@@ -17,7 +20,7 @@ if [ -f .hvk ]; then
     source .hvk
 else
     # Source x86 generic definition file
-    source ${SCRIPTPATH}/hvk-x86.sh
+    source ${PROG_PATH}/hvk-x86.sh
 fi
 
 : ${MAKEJOBS:="$(nproc)"}

diff --git a/scripts/hvk-compile.sh b/scripts/hvk-compile.sh
index 7057a20f4f00726ce81953ca018f8b41f16dea64..8e7a94506c03063c07eaee9000f9a1885639a727 100755 (executable)
--- a/scripts/hvk-compile.sh
+++ b/scripts/hvk-compile.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-PROG_NAME=$(basename $0)
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 DEPLOYDIR=rootfs
 ARCHIVE_LN=linux-latest.tar.xz

diff --git a/scripts/hvk-configure.sh b/scripts/hvk-configure.sh
index cf71e91040433be9acc99fae4b69c16b0fc57b9a..7badfdb73bd40c0235d675ad40cd116c5317e9cb 100755 (executable)
--- a/scripts/hvk-configure.sh
+++ b/scripts/hvk-configure.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 ${KMAKE} menuconfig

diff --git a/scripts/hvk-debug.sh b/scripts/hvk-debug.sh
index edfb2f38dbde2789e17cca012641096dd4268ed6..1f8824d8b7138a285dea173b1608771341e55cc9 100755 (executable)
--- a/scripts/hvk-debug.sh
+++ b/scripts/hvk-debug.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 KVER_BASE=$(make kernelversion)
 

diff --git a/scripts/hvk-dt.sh b/scripts/hvk-dt.sh
index 97b6757a0713e6582cf7769b3420124cf80b7f5d..20e61beb2e671e800b23d3a55ef572806297182c 100755 (executable)
--- a/scripts/hvk-dt.sh
+++ b/scripts/hvk-dt.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 if [ x"${DTS_BOARD}" != x"" ]; then
     DTB_FILES="${DTB_FILES} ${DTS_BOARD}"

diff --git a/scripts/hvk-init.sh b/scripts/hvk-init.sh
index bd189af43c5a42fdd7c39bcd573d976f2da43d09..ff99161c686b821f694cab5acb7313e8e2cedd31 100755 (executable)
--- a/scripts/hvk-init.sh
+++ b/scripts/hvk-init.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 if [ x"${DEFCONFIG_AUTOGEN}" != x"" ]; then
     if [ -x ${DEFCONFIG_AUTOGEN} ]; then

diff --git a/scripts/hvk-rebase.sh b/scripts/hvk-rebase.sh
index b56ef042fda5e28995fa0a0153d43b22396706df..e66fa975790b5db261ea496636f485a190e6e161 100755 (executable)
--- a/scripts/hvk-rebase.sh
+++ b/scripts/hvk-rebase.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
 
 print_usage()
 {

diff --git a/scripts/hvk-save-defconfig.sh b/scripts/hvk-save-defconfig.sh
index 287ca47d6c1ef02268af039bedb0b123c14cef18..5145b29ffbf0ab9b0a236c5e37d27d8351fa9159 100755 (executable)
--- a/scripts/hvk-save-defconfig.sh
+++ b/scripts/hvk-save-defconfig.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/hvk-common.sh
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
+source ${PROG_PATH}/hvk-common.sh
 
 case ${DEFCONFIG_BOARD} in
     all*)

diff --git a/scripts/hvk-select.sh b/scripts/hvk-select.sh
index 7a3327b61910bd10ecf2cd4004b589e7f3db095f..56b8dac9fe46e09bb29971a03deb7a8e79432f35 100755 (executable)
--- a/scripts/hvk-select.sh
+++ b/scripts/hvk-select.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
 
 hvk_src="${HOME}/.hvk"
 hvk_link=".hvk"

diff --git a/scripts/hvk-stack b/scripts/hvk-stack
index c526718c5b41be81761013dfa0c9bfe2bbe7600d..6e3f753cfa94faab59db1a2c692fdab9664d6bb8 100644 (file)
--- a/scripts/hvk-stack
+++ b/scripts/hvk-stack
@@ -2,8 +2,8 @@
 
 set -e
 
-SCRIPT="`readlink -e $0`"
-SCRIPTPATH=$(dirname ${SCRIPT})
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
 
 if [ ${#} -lt 1 -o ${#} -gt 2 ]; then
     echo "Invalid number of arguments (1 or 2)"

diff --git a/scripts/kernel-send-patches.sh b/scripts/kernel-send-patches.sh
index 75b0cc92e5a425d5a046bf440ffa084048299c9e..828c87a06e82772cbe70e3c3314c0d08c7c6d624 100755 (executable)
--- a/scripts/kernel-send-patches.sh
+++ b/scripts/kernel-send-patches.sh
@@ -10,7 +10,8 @@
 
 set -e
 
-PROG_NAME=$(basename $0)
+PROG_NAME="`readlink -e $0`"
+PROG_PATH=$(dirname ${PROG_NAME})
 
 trap 'catch $?' EXIT