Browse Source

minor formating fixes and provide Vim modelines in all scripts

tags/sipwise-2.4
Michael Prokop 10 years ago
parent
commit
f7f3acc6f7
10 changed files with 30 additions and 12 deletions
  1. +2
    -0
      git/post-receive
  2. +13
    -11
      scripts/build-and-provide-package
  3. +2
    -0
      scripts/generate-git-snapshot
  4. +2
    -0
      scripts/generate-local-repository
  5. +2
    -0
      scripts/generate-reprepro-codename
  6. +2
    -0
      scripts/generate-svn-snapshot
  7. +2
    -0
      scripts/increase-version-number
  8. +1
    -0
      svn/post-commit
  9. +2
    -1
      svn/trigger_jenkins
  10. +2
    -0
      tests/increase-version-number

+ 2
- 0
git/post-receive View File

@@ -59,3 +59,5 @@ else
trigger_jenkins $oldrev $newrev $refname
done
fi

# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2

+ 13
- 11
scripts/build-and-provide-package View File

@@ -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

+ 2
- 0
scripts/generate-git-snapshot View File

@@ -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

+ 2
- 0
scripts/generate-local-repository View File

@@ -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

+ 2
- 0
scripts/generate-reprepro-codename View File

@@ -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

+ 2
- 0
scripts/generate-svn-snapshot View File

@@ -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

+ 2
- 0
scripts/increase-version-number View File

@@ -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

+ 1
- 0
svn/post-commit View File

@@ -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

+ 2
- 1
svn/trigger_jenkins View File

@@ -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

+ 2
- 0
tests/increase-version-number View File

@@ -20,3 +20,5 @@ testEquality()
}

. /usr/share/shunit2/shunit2

# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2

Loading…
Cancel
Save