From 1e0a4265650e5678d427593eecd3c0f6ccbae22f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 28 Aug 2021 06:58:19 +0200 Subject: Updating. Signed-off-by: Daniel Baumann --- bin/git-checkout-all | 28 --------------------- bin/git-checkout-branches | 44 --------------------------------- bin/git-remove-origin-branches | 10 -------- bin/git-remove-origin-tags | 10 -------- bin/git-repo-repack | 45 --------------------------------- bin/git-whoami | 33 ------------------------- web/ignore.txt | 14 ----------- web/update | 56 ++++++++++++++++++++++-------------------- 8 files changed, 29 insertions(+), 211 deletions(-) delete mode 100755 bin/git-checkout-all delete mode 100755 bin/git-checkout-branches delete mode 100755 bin/git-remove-origin-branches delete mode 100755 bin/git-remove-origin-tags delete mode 100755 bin/git-repo-repack delete mode 100755 bin/git-whoami diff --git a/bin/git-checkout-all b/bin/git-checkout-all deleted file mode 100755 index eef1ad6..0000000 --- a/bin/git-checkout-all +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -CURRENT_BRANCH="$(git branch | awk '/^\* / { print $2 }')" -REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" - -for REMOTE_BRANCH in ${REMOTE_BRANCHES} -do - BRANCH="$(echo ${REMOTE_BRANCH} | cut -d/ -f 2-)" - - if [ "${BRANCH}" = "HEAD" ] - then - continue - fi - - if git branch | grep -q "${BRANCH}$" - then - continue - fi - - git checkout -b ${BRANCH} ${REMOTE_BRANCH} -done - -if [ "$(git branch | awk '/^\* / { print $2 }')" != "${CURRENT_BRANCH}" ] -then - git checkout ${CURRENT_BRANCH} -fi diff --git a/bin/git-checkout-branches b/bin/git-checkout-branches deleted file mode 100755 index 770551d..0000000 --- a/bin/git-checkout-branches +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# source-tools - Git extra utilities -# Copyright (C) 2014-2016 Daniel Baumann -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -set -e - -CURRENT_BRANCH="$(git branch | awk '/^\* / { print $2 }')" -REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" - -for REMOTE_BRANCH in ${REMOTE_BRANCHES} -do - BRANCH="$(echo ${REMOTE_BRANCH} | cut -d/ -f 2-)" - - if [ "${BRANCH}" = "HEAD" ] - then - continue - fi - - if git branch | grep -q "${BRANCH}$" - then - continue - fi - - git checkout -b ${BRANCH} ${REMOTE_BRANCH} -done - -if [ "$(git branch | awk '/^\* / { print $2 }')" != "${CURRENT_BRANCH}" ] -then - git checkout ${CURRENT_BRANCH} -fi diff --git a/bin/git-remove-origin-branches b/bin/git-remove-origin-branches deleted file mode 100755 index f65f037..0000000 --- a/bin/git-remove-origin-branches +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -BRANCHES="${@}" - -for BRANCH in ${BRANCHES} -do - git push origin :${BRANCH} -done diff --git a/bin/git-remove-origin-tags b/bin/git-remove-origin-tags deleted file mode 100755 index 8598409..0000000 --- a/bin/git-remove-origin-tags +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -TAGS="${@}" - -for TAG in ${TAGS} -do - git push origin :refs/tags/${TAG} -done diff --git a/bin/git-repo-repack b/bin/git-repo-repack deleted file mode 100755 index 9e733d2..0000000 --- a/bin/git-repo-repack +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - --quiet) - QUIET="true" - shift - - GIT_REPACK_OPTIONS="-q" - GIT_GC_OPTIONS="--quiet" - ;; -esac - -REPOSITORIES="${@}" - -if [ -z "${REPOSITORIES}" ] -then - if [ ! -e HEAD ] - then - REPOSITORIES="*.git" - else - REPOSITORIES="$(pwd)" - fi -fi - -for REPOSITORY in ${REPOSITORIES} -do - [ "${QUIET}" ] || echo "--------------------------------------------------------------------------------" - [ "${QUIET}" ] || echo ${REPOSITORY} - [ "${QUIET}" ] || echo "--------------------------------------------------------------------------------" - - cd "${REPOSITORY}" - git repack ${GIT_REPACK_OPTIONS} -a -b -d -f -F - git gc ${GIT_GC_OPTIONS} --aggressive --prune - cd "${OLDPWD}" - - if [ "$(id -u)" -eq "0" ] - then - UID="$(stat -c %u ${REPOSITORY})" - GID="$(stat -c %g ${REPOSITORY})" - - chown ${UID}:${GID} "${REPOSITORY}" -R - fi -done diff --git a/bin/git-whoami b/bin/git-whoami deleted file mode 100755 index 9cab9bc..0000000 --- a/bin/git-whoami +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# git-whoami -# Author: Peter Eisentraut -# Created: 2011-10-27 -# License: WTFPL; see http://sam.zoy.org/wtfpl/ - -# exact logic in ident.c in git source tree - -set -e - -get_email() { - git config user.email || ( [ -n "$EMAIL" ] && echo "$EMAIL" ) || echo "$(id -nu)@$(hostname --fqdn)" -} - -get_name() { - git config user.name || getent passwd $(id -un) | cut -d : -f 5 | cut -d , -f 1 -} - -: ${GIT_AUTHOR_NAME=$(get_name)} -: ${GIT_COMMITTER_NAME=$(get_name)} -: ${GIT_AUTHOR_EMAIL=$(get_email)} -: ${GIT_COMMITTER_EMAIL=$(get_email)} - -author="$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" -commit="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" - -if [ "$author" = "$commit" ]; then - echo "$author" -else - echo "Author: $author" - echo "Commit: $commit" -fi diff --git a/web/ignore.txt b/web/ignore.txt index 043810b..e69de29 100644 --- a/web/ignore.txt +++ b/web/ignore.txt @@ -1,14 +0,0 @@ -# progress-linux -cryptsetup 2:2.3.4-1+exp1 -e2fsprogs 1.46~WIP.2019.10.03-1 -icu 68.1-1 -libgit2 1.0.1+dfsg.1-1 -libreoffice 1:7.1.0~alpha1-1 -openssl 3.0.0~~alpha4-1 - -# obsolete -llvm-toolchain-8 1:8.0.1-10~progress5+u1 -tty-server 0.0~git20201105.50b9367+ds-1~progress5+u1 - -# bfh -octave 6.0.90-1 diff --git a/web/update b/web/update index 20758ae..ca5910d 100755 --- a/web/update +++ b/web/update @@ -78,34 +78,36 @@ UPSTREAM_MIRROR="http://debian.ethz.ch/debian" DOWNSTREAM_SECTIONS="main contrib non-free" -Download_downstream_sources () +ARCHITECTURES="amd64 armel armhf arm64 i386 source" + +Download_downstream_indices () { - # Download downstream sources -# if [ -e "downstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y downstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] + # Download downstream indices +# if [ -e "downstream.${MODE}.indices" ] && [ "$(( $(stat -c %Y downstream.${MODE}.indices) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] # then # # file is older than 4 hours - rm -f "downstream.${MODE}.sources" + rm -f "downstream.${MODE}.indices" # fi - if [ ! -e "downstream.${MODE}.sources" ] + if [ ! -e "downstream.${MODE}.indices" ] then for SECTION in ${DOWNSTREAM_SECTIONS} do - wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DOWNSTREAM_DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.sources" + wget -q -O - "${DOWNSTREAM_MIRROR}/dists/${DOWNSTREAM_DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "downstream.${MODE}.indices" done fi } -Download_upstream_sources () +Download_upstream_indices () { - # Download upstream sources - if [ -e "upstream.${MODE}.sources" ] && [ "$(( $(stat -c %Y upstream.${MODE}.sources) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] - then - # file is older than 4 hours - rm -f "upstream.${MODE}.sources" - fi + # Download upstream indices +# if [ -e "upstream.${MODE}.indices" ] && [ "$(( $(stat -c %Y upstream.${MODE}.indices) + ( 4 * 3600 ) ))" -lt "$(date +%s)" ] +# then +# # file is older than 4 hours + rm -f "upstream.${MODE}.indices" +# fi - if [ ! -e "upstream.${MODE}.sources" ] + if [ ! -e "upstream.${MODE}.indices" ] then for DISTRIBUTION in ${UPSTREAM_DISTRIBUTIONS} do @@ -118,7 +120,7 @@ Download_upstream_sources () then for SECTION in ${UPSTREAM_SECTIONS} do - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources" + wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}/updates/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices" done fi @@ -126,7 +128,7 @@ Download_upstream_sources () then for SECTION in ${UPSTREAM_SECTIONS} do - wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources" + wget -q -O - "http://security.debian.org/dists/${DISTRIBUTION}-security/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices" done fi ;; @@ -134,17 +136,17 @@ Download_upstream_sources () for SECTION in ${UPSTREAM_SECTIONS} do - wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.sources" + wget -q -O - "${UPSTREAM_MIRROR}/dists/${DISTRIBUTION}/${SECTION}/source/Sources.xz" | xz -d >> "upstream.${MODE}.indices" done done fi } -Download_downstream_sources -Download_upstream_sources +Download_downstream_indices +Download_upstream_indices -# Process downstream sources -DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.sources | sort -u)" +# Process downstream indices +DOWNSTREAM_PACKAGES="$(awk '/^Package: / { print $2 }' downstream.${MODE}.indices | sort -u)" echo "################################################################################" echo "${DOWNSTREAM_DISTRIBUTION}" @@ -154,8 +156,8 @@ echo -n "Comparing versions... " for PACKAGE in ${DOWNSTREAM_PACKAGES} do - DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.sources | awk '/^Version: / { print $2 }')" - UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.sources | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" + DOWNSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" downstream.${MODE}.indices | awk '/^Version: / { print $2 }')" + UPSTREAM_VERSION="$(sed -n "/^Package: ${PACKAGE}$/,/^Version:/p" upstream.${MODE}.indices | awk '/^Version: / { print $2 }' | sort -rV | head -n1)" if echo ${UPSTREAM_VERSION} | grep -qs '-' then @@ -178,7 +180,7 @@ do if [ -z "${UPSTREAM_VERSION}" ] then - echo "${BLUE}${PACKAGE}${NORMAL} '!${DOWNSTREAM_VERSION}'" + echo " ${BLUE}${PACKAGE}${NORMAL} (!${DOWNSTREAM_VERSION})" continue fi @@ -188,12 +190,12 @@ do echo -n "." elif dpkg --compare-versions ${UPSTREAM_VERSION} gt ${DOWNSTREAM} then - echo "${RED}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION}'" + echo " ${RED}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION})" elif dpkg --compare-versions ${UPSTREAM_VERSION} lt ${DOWNSTREAM} then - echo "${YELLOW}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION}'" + echo " ${YELLOW}${PACKAGE}${NORMAL} (${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION})" else - echo "${PACKAGE}: internal error" + echo " ${PACKAGE}: internal error" fi done -- cgit v1.2.3