gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Small fix for wmaker nightly build script

Browse Source
This commit is contained in:
Martin Dietze
2010-01-08 12:08:54 +01:00
committed by Carlos R. Mafra
parent f55eef413f
commit 4e90a87b14
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
debian/nightly_build.sh vendored
View File

@@ -8,12 +8,12 @@ CHANGELOG="Automatic build from the GIT on `date`"
BUILDLOG="${HOME}/log/wmaker-testing-nightly.log" BUILDLOG="${HOME}/log/wmaker-testing-nightly.log"
STATUSCMD="git log -1 --pretty=oneline" STATUSCMD="git log -1 --pretty=oneline"
PULLCMD1="git fetch" PULLCMD1="git pull"
PULLCMD2="git checkout origin/master" #PULLCMD2="git checkout origin/master"
if [ -n "${WMAKER_DISTRO}" ]; then if [ -n "${WMAKER_DISTRO}" ]; then
case ${WMAKER_DISTRO} in case ${WMAKER_DISTRO} in
unstable) unstable)
PULLCMD2="git checkout origin/next" #PULLCMD2="git checkout next"
BUILDLOG="${HOME}/log/wmaker-unstable-nightly.log" BUILDLOG="${HOME}/log/wmaker-unstable-nightly.log"
;; ;;
esac esac
@@ -47,7 +47,7 @@ doPull() {
RC="1" RC="1"
LATEST="`$STATUSCMD`" LATEST="`$STATUSCMD`"
$PULLCMD1 >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo" $PULLCMD1 >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo"
$PULLCMD2 >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo" #$PULLCMD2 >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo"
CURRENT="`$STATUSCMD`" CURRENT="`$STATUSCMD`"
if [ "$FORCE" = "1" -o "$LATEST" != "$CURRENT" ]; then if [ "$FORCE" = "1" -o "$LATEST" != "$CURRENT" ]; then
echo "last revision: $LATEST" >>$BUILDLOG echo "last revision: $LATEST" >>$BUILDLOG