when running patchimage from git, use it's tools, scripts and stuff, instead of system-wide installed

This commit is contained in:
Christopher Roy Bratusek 2016-07-03 20:07:55 +02:00
parent b9eea9572f
commit ca0349994d
2 changed files with 16 additions and 16 deletions

View File

@ -6,25 +6,24 @@
# #
# License: GPL v3 # License: GPL v3
if [[ -d ${PWD}/script.d ]]; then basedir=$(readlink -m "${BASH_SOURCE[0]}")
PATCHIMAGE_SCRIPT_DIR=${PWD}/script.d basedir=$(dirname ${basedir})
PATCHIMAGE_PATCH_DIR=${PWD}/patches
PATCHIMAGE_TOOLS_DIR=${PWD}/tools if [[ -d ${basedir}/script.d ]]; then
PATCHIMAGE_SCRIPT_DIR=${basedir}/script.d
PATCHIMAGE_PATCH_DIR=${basedir}/patches
PATCHIMAGE_TOOLS_DIR=${basedir}/tools
else else
PATCHIMAGE_SCRIPT_DIR=/usr/share/patchimage/script.d PATCHIMAGE_SCRIPT_DIR=/usr/share/patchimage/script.d
PATCHIMAGE_PATCH_DIR=/usr/share/patchimage/patches PATCHIMAGE_PATCH_DIR=/usr/share/patchimage/patches
PATCHIMAGE_TOOLS_DIR=/usr/share/patchimage/tools PATCHIMAGE_TOOLS_DIR=/usr/share/patchimage/tools
fi fi
PATCHIMAGE_RIIVOLUTION_DIR=${PWD} PATCHIMAGE_RIIVOLUTION_DIR=${basedir}
PATCHIMAGE_WBFS_DIR=${PWD} PATCHIMAGE_WBFS_DIR=${basedir}
PATCHIMAGE_AUDIO_DIR=${PWD} PATCHIMAGE_AUDIO_DIR=${basedir}
PATCHIMAGE_GAME_DIR=${PWD} PATCHIMAGE_GAME_DIR=${basedir}
PATCHIMAGE_COVER_DIR=${PWD} PATCHIMAGE_COVER_DIR=${basedir}
if [[ -e $HOME/.patchimage.rc ]]; then
source $HOME/.patchimage.rc
fi
source ${PATCHIMAGE_SCRIPT_DIR}/common.sh source ${PATCHIMAGE_SCRIPT_DIR}/common.sh
optparse "${@}" optparse "${@}"

View File

@ -1,14 +1,15 @@
#!/bin/bash #!/bin/bash
PATCHIMAGE_VERSION=6.2.1 PATCHIMAGE_VERSION=6.3.0
PATCHIMAGE_RELEASE=2016-07-03 PATCHIMAGE_RELEASE=2016-07-03
[[ -e $HOME/.patchimage.rc ]] && source $HOME/.patchimage.rc
setup_tools () { setup_tools () {
if [[ $(uname -m) == "x86_64" ]]; then if [[ $(uname -m) == "x86_64" ]]; then
SUFFIX=64 SUFFIX=64
else else SUFFIX=32
SUFFIX=32
fi fi
WIT=${PATCHIMAGE_TOOLS_DIR}/wit.${SUFFIX} WIT=${PATCHIMAGE_TOOLS_DIR}/wit.${SUFFIX}