Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-23 08:19:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed version_detail_bash_script with shadow build

Browse Source
This commit is contained in:
thunder2 2016-05-17 19:02:14 +02:00
parent ea6431e276
commit 5f5ce4ab63
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View File

@ -203,7 +203,7 @@ version_detail_bash_script {
linux-* { linux-* {
QMAKE_EXTRA_TARGETS += write_version_detail QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = ./version_detail.sh write_version_detail.commands = $$PWD/version_detail.sh
} }
win32 { win32 {
QMAKE_EXTRA_TARGETS += write_version_detail QMAKE_EXTRA_TARGETS += write_version_detail

5
libretroshare/src/version_detail.sh
View File

@ -3,6 +3,8 @@
#don't exit even if a command fails #don't exit even if a command fails
set +e set +e
pushd $(dirname "$0")
SCRIPT_PATH=$(dirname "`readlink -f "${0}"`") SCRIPT_PATH=$(dirname "`readlink -f "${0}"`")
OLDLANG=${LANG} OLDLANG=${LANG}
@ -32,5 +34,8 @@ if [[ ${version} != '' ]]; then
fi fi
export LANG=${OLDLANG} export LANG=${OLDLANG}
popd
echo "script version_detail.sh finished normally" echo "script version_detail.sh finished normally"
exit 0 exit 0

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -123,7 +123,7 @@ version_detail_bash_script {
DEFINES += ADD_LIBRETROSHARE_VERSION_INFO DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
QMAKE_EXTRA_TARGETS += write_version_detail QMAKE_EXTRA_TARGETS += write_version_detail
PRE_TARGETDEPS = write_version_detail PRE_TARGETDEPS = write_version_detail
write_version_detail.commands = ./version_detail.sh write_version_detail.commands = $$PWD/version_detail.sh
} }
win32 { win32 {
QMAKE_EXTRA_TARGETS += write_version_detail QMAKE_EXTRA_TARGETS += write_version_detail

5
retroshare-gui/src/version_detail.sh
View File

@ -5,6 +5,8 @@
#don't exit even if a command fails #don't exit even if a command fails
set +e set +e
pushd $(dirname "$0")
OLDLANG=${LANG} OLDLANG=${LANG}
export LANG=C export LANG=C
@ -34,5 +36,8 @@ if (ls &> /dev/null); then
fi fi
export LANG=${OLDLANG} export LANG=${OLDLANG}
popd
echo "version_detail.sh scripts finished" echo "version_detail.sh scripts finished"
exit 0 exit 0