summaryrefslogtreecommitdiff
path: root/archPackagesUpdate
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-11-12 20:17:57 +0100
committerErich Eckner <git@eckner.net>2020-11-15 18:34:55 +0100
commit8eeeecace2d3e740b089f135b30cbc5128b3c2db (patch)
tree9744181362f77c14f57d41cbdd1305e9041c386b /archPackagesUpdate
parent6a9aa0b06fa8688cb9a986233dfe189a33ef674a (diff)
downloadarchlinuxewe.git.save-8eeeecace2d3e740b089f135b30cbc5128b3c2db.tar.xz
archPackagesUpdate: do not handle the git stuff
Diffstat (limited to 'archPackagesUpdate')
-rwxr-xr-xarchPackagesUpdate52
1 files changed, 1 insertions, 51 deletions
diff --git a/archPackagesUpdate b/archPackagesUpdate
index c5a18270..2de17220 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -9,7 +9,6 @@ pkgSrcDir="$(dirname $(readlink -f -n "$0"))"
export SRCDEST="${HOME}/packageSources"
export PACKAGER='Erich Eckner <arch at eckner dot net>'
key='5FDCA472AB93292BC678FD59255A76DB9A12601A'
-branch="HEAD"
force=false
upload=true
updateMe=true
@@ -33,8 +32,6 @@ usage()
>&2 echo 'Optionen:'
>&2 echo ' --arch $arch:'
>&2 echo ' only compile for $arch'
- >&2 echo ' -b|--branch [commitish]:'
- >&2 echo ' branch to check out - defaults to "HEAD"'
>&2 echo ' -c|--cleanChroot:'
>&2 echo ' clean chroot before building'
>&2 echo ' --cleanUnsigned:'
@@ -83,9 +80,8 @@ cleanUp () {
echo 'parse arguments ...'
eval set -- "$(
- getopt -o b:cfL:pr \
+ getopt -o cfL:pr \
--long arch: \
- --long branch: \
--long cleanChroot \
--long cleanUnsigned \
--long force \
@@ -112,11 +108,6 @@ while true; do
echo '"arch '"$1"'" erkannt'
onlyArchs[${#onlyArchs[@]}]="$1"
;;
- -b|--branch)
- shift
- branch="$1"
- echo '"branch '"${branch}"'" erkannt'
- ;;
-c|--cleanChroot)
echo '"cleanChroot" erkannt'
cleanChroot='-c'
@@ -199,32 +190,6 @@ fi
echo '... done'
-# extract git ${branch}
-git -C "${pkgSrcDir}" archive --format tar "${branch}" | \
- tar -x -C "${tmpDir}" -f -
-git -C "${pkgSrcDir}" diff '6dc373759d940181bcb2a742f1f37548a7c1cacc' "${branch}" -- $(
- sed '
- s/^\[submodule "\([^"[:space:]]\+\)"\]$/\1/
- t
- d
- ' "${tmpDir}/.gitmodules"
-) \
-| sed '
- /^+++ b/ {
- N
- N
- s#^+++ b/\(\S\+\)\n@@ -0,0 +1 @@\n+Subproject commit \([0-9a-f]\{40\}\)$#\1 \2#
- t
- }
- d
-' \
-| while read -r module commit; do
- rmdir "${tmpDir}/${module}"
- echo "${commit}" >"${tmpDir}/${module}"
-done
-
-cd "${tmpDir}"
-
# clean unsigned packages
if ${cleanUnsigned}; then
ssh archlinuxewe@eckner.net "$(
@@ -268,21 +233,6 @@ unset archs
unset verss
unset repos
-if [ -f '.gitmodules' ]; then
- >&2 printf 'updating submodules ...'
- sed -n '
- /^\s*path = /{
- N
- s/^\s*path = //
- s/\n\s*url = / /
- s,ssh://aur@aur.archlinux.org/,https://aur.archlinux.org/,
- p
- }
- ' '.gitmodules' \
- | parallel -j0 "${tmpDir}/update-submodule" "${pkgSrcDir}" "${submoduleDir}"
- >&2 printf ' done.\n'
-fi
-
# check packages
if ${checkSanity}; then