From f7f3acc6f7ef7bf7db03b6b94d67d1272dfaaee2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 21 Nov 2011 23:51:50 +0100 Subject: [PATCH] minor formating fixes and provide Vim modelines in all scripts --- git/post-receive | 2 ++ scripts/build-and-provide-package | 24 +++++++++++++----------- scripts/generate-git-snapshot | 2 ++ scripts/generate-local-repository | 2 ++ scripts/generate-reprepro-codename | 2 ++ scripts/generate-svn-snapshot | 2 ++ scripts/increase-version-number | 2 ++ svn/post-commit | 1 + svn/trigger_jenkins | 3 ++- tests/increase-version-number | 2 ++ 10 files changed, 30 insertions(+), 12 deletions(-) diff --git a/git/post-receive b/git/post-receive index 0e34d27..9a12968 100755 --- a/git/post-receive +++ b/git/post-receive @@ -59,3 +59,5 @@ else trigger_jenkins $oldrev $newrev $refname done fi + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/build-and-provide-package b/scripts/build-and-provide-package index 4df2b43..2045109 100755 --- a/scripts/build-and-provide-package +++ b/scripts/build-and-provide-package @@ -202,17 +202,17 @@ identify_build_type() { tar axf "$file" "$control_file" || bailout 1 "Error while looking at debian/control in source archive." if grep -q '^Architecture: all' "$control_file" ; then - if grep -q '^Architecture: any' "$control_file" ; then - echo "*** Package provides arch 'all' + 'any', enabling -B buildoption for this architecture. ***" - # -B -> binary-only build, limited to architecture dependent packages - DEBBUILDOPTS="-B" - break - else - # only "Architecture: all", so no arch specific packages since - # we aren't building for $MAIN_ARCHITECTURE - SKIP_ARCH_BUILD=true - break - fi + if grep -q '^Architecture: any' "$control_file" ; then + echo "*** Package provides arch 'all' + 'any', enabling -B buildoption for this architecture. ***" + # -B -> binary-only build, limited to architecture dependent packages + DEBBUILDOPTS="-B" + break + else + # only "Architecture: all", so no arch specific packages since + # we aren't building for $MAIN_ARCHITECTURE + SKIP_ARCH_BUILD=true + break + fi fi fi done @@ -406,3 +406,5 @@ deploy_to_releases binaries_to_workspace bailout 0 + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/generate-git-snapshot b/scripts/generate-git-snapshot index a73ba30..ad96d20 100755 --- a/scripts/generate-git-snapshot +++ b/scripts/generate-git-snapshot @@ -130,3 +130,5 @@ mkdir -p ${JENKINS_HOME}/userContent/${JOB_NAME}/ echo "Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data" rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"* + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/generate-local-repository b/scripts/generate-local-repository index a7c610a..06d9a4a 100755 --- a/scripts/generate-local-repository +++ b/scripts/generate-local-repository @@ -11,3 +11,5 @@ Label: Grml Autobuild NotAutomatic: yes EOF apt-ftparchive release . >> Release + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/generate-reprepro-codename b/scripts/generate-reprepro-codename index 0bbdcfc..2ea3ddd 100755 --- a/scripts/generate-reprepro-codename +++ b/scripts/generate-reprepro-codename @@ -68,3 +68,5 @@ if [ -n "${KEY_ID:-}" ] ; then fi echo "Added $REPOS as new codename/repos to the reprepro configuration." + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/generate-svn-snapshot b/scripts/generate-svn-snapshot index a542b46..f93b25f 100755 --- a/scripts/generate-svn-snapshot +++ b/scripts/generate-svn-snapshot @@ -134,3 +134,5 @@ mkdir -p "${JENKINS_HOME}/userContent/${JOB_NAME}/" echo "*** Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data ***" rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"* + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/scripts/increase-version-number b/scripts/increase-version-number index 5a9ed3f..10a80ea 100755 --- a/scripts/increase-version-number +++ b/scripts/increase-version-number @@ -32,3 +32,5 @@ fi # until it's 1.2.4, 1.3, etc. echo "${1}+0" + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/svn/post-commit b/svn/post-commit index 3d25497..92235cb 100755 --- a/svn/post-commit +++ b/svn/post-commit @@ -23,3 +23,4 @@ bash -x /usr/bin/trigger_jenkins "$1" "$2" >> /tmp/trigger_jenkins 2>>/tmp/trigg echo >> /tmp/trigger_jenkins /tmp/trigger_jenkins_stderr # EOF +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/svn/trigger_jenkins b/svn/trigger_jenkins index 6af939b..31e0672 100755 --- a/svn/trigger_jenkins +++ b/svn/trigger_jenkins @@ -42,7 +42,7 @@ for dir in $(/usr/bin/svnlook dirs-changed "$REPOS" $REV_OPTS) ; do trigger_branch=ignore ;; tags/*) - # disclaimer: yes, brrrr - don't ask... + # disclaimer: yes, brrrr - don't ask... # sort: try to move the shortest line to the beginning # grep: make sure we only get _U/U (updates) and _A/A (additions) # head: limit the result to just one project @@ -91,3 +91,4 @@ if [ -n "$trigger_project" ] ; then fi # EOF +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2 diff --git a/tests/increase-version-number b/tests/increase-version-number index 5311d7b..4ba71fb 100755 --- a/tests/increase-version-number +++ b/tests/increase-version-number @@ -20,3 +20,5 @@ testEquality() } . /usr/share/shunit2/shunit2 + +# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2