fix source dir problem for future deb packaging
This commit is contained in:
parent
12c9864754
commit
2fc30c7f7a
3 changed files with 18 additions and 15 deletions
|
@ -71,7 +71,7 @@ function runCmd () {
|
|||
function pressKey () {
|
||||
printf "$*\n"
|
||||
if which mpg123 >/dev/null; then
|
||||
mpg123 -q $scriptDir/notify.mp3 &
|
||||
mpg123 -q /opt/yggdrasil/notify.mp3 &
|
||||
fi
|
||||
printf $INV
|
||||
read -p "Press <Enter> key to continue ..."
|
||||
|
|
7
vars.sh
7
vars.sh
|
@ -13,18 +13,13 @@
|
|||
#
|
||||
# app version number
|
||||
#
|
||||
version="0.3.0"
|
||||
version="0.4.0"
|
||||
|
||||
#
|
||||
# myHomedir is used in full paths to the homedir
|
||||
#
|
||||
myHomedir=$(whoami)
|
||||
|
||||
#
|
||||
# script base dir
|
||||
#
|
||||
scriptDir=$(dirname $0)
|
||||
|
||||
#
|
||||
# logfile
|
||||
#
|
||||
|
|
24
yggdrasil.sh
24
yggdrasil.sh
|
@ -10,12 +10,22 @@
|
|||
#
|
||||
# include functions and vars from external files
|
||||
#
|
||||
source $(dirname $0)/vars.sh
|
||||
source $(dirname $0)/core_functions.sh
|
||||
source $(dirname $0)/repo_functions.sh
|
||||
source $(dirname $0)/install_functions.sh
|
||||
source $(dirname $0)/menus_functions.sh
|
||||
source $(dirname $0)/tools_functions.sh
|
||||
dir=$(dirname $0)
|
||||
if [ ! $dir == "/opt/yggdrasil" ]; then
|
||||
source /opt/yggdrasil/vars.sh
|
||||
source /opt/yggdrasil/core_functions.sh
|
||||
source /opt/yggdrasil/repo_functions.sh
|
||||
source /opt/yggdrasil/install_functions.sh
|
||||
source /opt/yggdrasil/menus_functions.sh
|
||||
source /opt/yggdrasil/tools_functions.sh
|
||||
else
|
||||
source $(dirname $0)/vars.sh
|
||||
source $(dirname $0)/core_functions.sh
|
||||
source $(dirname $0)/repo_functions.sh
|
||||
source $(dirname $0)/install_functions.sh
|
||||
source $(dirname $0)/menus_functions.sh
|
||||
source $(dirname $0)/tools_functions.sh
|
||||
fi
|
||||
|
||||
#
|
||||
# check if the script is running in root/sudo
|
||||
|
@ -113,8 +123,6 @@ done
|
|||
# Menu Mode #
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
clear
|
||||
|
||||
# show Yggdrasil logo
|
||||
dispLogo
|
||||
|
||||
|
|
Loading…
Reference in a new issue