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

Small fix for wmaker nightly build script 2

Browse Source
This commit is contained in:
Martin Dietze
2010-01-12 12:41:00 +01:00
committed by Carlos R. Mafra
parent 72dfe4aa89
commit c89cb142ba
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
debian/nightly_build.sh vendored
View File

@@ -8,12 +8,10 @@ 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 pull" PULLCMD="git pull"
#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 next"
BUILDLOG="${HOME}/log/wmaker-unstable-nightly.log" BUILDLOG="${HOME}/log/wmaker-unstable-nightly.log"
;; ;;
esac esac
@@ -46,8 +44,7 @@ errorExit() {
doPull() { doPull() {
RC="1" RC="1"
LATEST="`$STATUSCMD`" LATEST="`$STATUSCMD`"
$PULLCMD1 >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo" $PULLCMD >>$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
@@ -87,6 +84,7 @@ trap 'cleanup; exit 2' 15
test -d debian || errorExit "This script must be called from the toplevel source dir, ./debian must exist." test -d debian || errorExit "This script must be called from the toplevel source dir, ./debian must exist."
git status | grep modified: | awk '{ print $3 }' | xargs git checkout
RC=0 RC=0
if doPull ; then if doPull ; then
doEnv doEnv