summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/d-i_build.sh18
-rwxr-xr-xbin/d-i_manual.sh22
2 files changed, 29 insertions, 11 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 19f8746d..c92b880a 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -7,18 +7,25 @@ DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
-init_workspace() {
+clean_workspace() {
#
# clean
#
+ cd $WORKSPACE
cd ..
- rm -fv *.deb *.udeb *.dsc *_*.build *_*.changes *_*.tar.gz *_*.tar.bz2 *_*.tar.xz
+ rm -fv *.deb *.udeb *.dsc *_*.build *_*.changes *_*.tar.gz *_*.tar.bz2 *_*.tar.xz *_*.buildinfo
cd workspace
#
# git clone and pull is done by jenkins job
#
- git config -l
- git status
+ if [ -d .git ] ; then
+ echo "git status:"
+ git status
+ elif [ -f .svn ] ; then
+ echo "svn status:"
+ svn status
+ fi
+ echo
}
pdebuild_package() {
@@ -70,7 +77,7 @@ pdebuild_package() {
sudo dcmd rm /var/cache/pbuilder/result/${SOURCE}_*changes
}
-init_workspace
+clean_workspace
#
# if $1 is not given, build the package normally,
# else...
@@ -80,3 +87,4 @@ if [ "$1" = "" ] ; then
else
echo do something else ; exit 1
fi
+clean_workspace
diff --git a/bin/d-i_manual.sh b/bin/d-i_manual.sh
index df1b847f..1a4d18a3 100755
--- a/bin/d-i_manual.sh
+++ b/bin/d-i_manual.sh
@@ -7,16 +7,25 @@ DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
-init_workspace() {
+clean_workspace() {
#
# clean
#
- rm -fv *.deb *.dsc *_*.build *_*.changes *_*.tar.gz
-
+ cd $WORKSPACE
+ cd ..
+ rm -fv *.deb *.udeb *.dsc *_*.build *_*.changes *_*.tar.gz *_*.tar.bz2 *_*.tar.xz *_*.buildinfo
+ cd workspace
#
- # svn checkout and update is done by jenkins job
+ # git clone and pull is done by jenkins job
#
- svn status
+ if [ -d .git ] ; then
+ echo "git status:"
+ git status
+ elif [ -f .svn ] ; then
+ echo "svn status:"
+ svn status
+ fi
+ echo
}
pdebuild_package() {
@@ -106,7 +115,7 @@ po_cleanup() {
rm -rv manual/$1 manual/integrated
}
-init_workspace
+clean_workspace
#
# if $1 is not given, build the whole manual,
# else just the language $1 in format $2
@@ -129,3 +138,4 @@ else
po_cleanup $1
fi
fi
+clean_workspace