From: Hugo Villeneuve Date: Fri, 27 Mar 2026 14:27:14 +0000 (-0400) Subject: Standardize PROG_NAME and PROG_PATH X-Git-Url: http://gitweb.hugovil.com/sitemap.xml?a=commitdiff_plain;h=85f90aae9c4dfc9502394e68b4273c8635ebe7d7;p=hvutilities.git Standardize PROG_NAME and PROG_PATH Signed-off-by: Hugo Villeneuve --- diff --git a/scripts/hv-scan b/scripts/hv-scan index cca5d58..26ddf4f 100755 --- 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 1310cf6..2796a6d 100644 --- 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 7057a20..8e7a945 100755 --- 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 cf71e91..7badfdb 100755 --- 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 edfb2f3..1f8824d 100755 --- 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 97b6757..20e61be 100755 --- 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 bd189af..ff99161 100755 --- 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 b56ef04..e66fa97 100755 --- 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 287ca47..5145b29 100755 --- 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 7a3327b..56b8dac 100755 --- 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 c526718..6e3f753 100644 --- 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 75b0cc9..828c87a 100755 --- 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