diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-20 16:17:27 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-20 16:21:25 +0200 |
| commit | 4bb1aab26319671a8ba40b663a07c0cf6213164b (patch) | |
| tree | bcafe6e97544981c9bb6443920dd61a1be608cf2 | |
| parent | 9bf2c07b1fd571350022585b5a057c39a8558656 (diff) | |
| download | buildscripts-4bb1aab26319671a8ba40b663a07c0cf6213164b.tar.gz buildscripts-4bb1aab26319671a8ba40b663a07c0cf6213164b.tar.bz2 buildscripts-4bb1aab26319671a8ba40b663a07c0cf6213164b.zip | |
sbuild-deb-package: Support DEB repos that don't have "/" as base path, but that reside in some subfolder of "/".
| -rwxr-xr-x | bin/sbuild-deb-package | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index d146ed2..8d35e3c 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -34,6 +34,7 @@ COMPONENT_RELEASE="release" COMPONENT_NIGHTLY="nightly" COMPONENT_BUNDLES="bundle-release1 bundle-release2" REPOS_SERVER="packages.mydomain.org" +REPOS_BASE="/" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME="${HOME}/.gnupg" @@ -288,11 +289,11 @@ build_packages() { mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386} OTHERMIRROR="" if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then - grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST}-nightly ${l_CODENAME} main" + grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}${REPOS_BASE}${l_DIST}-nightly ${l_CODENAME} main" elif echo "${COMPONENT_BUNDLES}" | grep -q "${COMPONENT}" 1>/dev/null; then - grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST}-${COMPONENT} ${l_CODENAME} main" + grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}${REPOS_BASE}${l_DIST}-${COMPONENT} ${l_CODENAME} main" else - grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} main" + grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}${REPOS_BASE}${l_DIST} ${l_CODENAME} main" fi # create git changelog immediately prior to building the package git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog |