This commit is contained in:
Daniel Langbein 2021-05-13 15:57:53 +00:00
parent 63605427bb
commit 1e30814614
2 changed files with 10 additions and 10 deletions

View File

@ -2,8 +2,8 @@
_pkgname=repo _pkgname=repo
_reponame=arch _reponame=arch
pkgname="de-p1st-$_pkgname" pkgname="de-p1st-$_pkgname"
pkgver=0.2.0 pkgver=0.2.1
pkgrel=2 pkgrel=1
pkgdesc="Bash script to manage remote Arch Linux repository" pkgdesc="Bash script to manage remote Arch Linux repository"
arch=('any') arch=('any')
url="https://codeberg.org/privacy1st/${_reponame}" url="https://codeberg.org/privacy1st/${_reponame}"

View File

@ -3,7 +3,7 @@
source /etc/de-p1st-repo/arch-repo.cfg || exit source /etc/de-p1st-repo/arch-repo.cfg || exit
function main() { function main() {
cd "${LOCAL_PKG_DIR}" || exit cd "${LOCAL_PKG_DIR}" || return $?
# check if at least one matching file exists # check if at least one matching file exists
match="0" match="0"
@ -17,7 +17,7 @@ function main() {
if [ "$match" = "0" ]; then if [ "$match" = "0" ]; then
echo "There are no local packages" echo "There are no local packages"
exit 0 return 0
fi fi
@ -25,26 +25,26 @@ function main() {
# Enable nullglob for the case that e.g. just *.zst but not *.xz packages exist. # Enable nullglob for the case that e.g. just *.zst but not *.xz packages exist.
shopt -s nullglob shopt -s nullglob
rsync --ignore-existing --out-format="%n" --dry-run \ rsync --ignore-existing --out-format="%n" --dry-run \
./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" > new-pkg.txt || exit ./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" > new-pkg.txt || return $?
# if there are no new packages to push/synchronize, then exit # if there are no new packages to push/synchronize, then return
if [ ! -s new-pkg.txt ]; then if [ ! -s new-pkg.txt ]; then
echo "No new packages."; echo "No new packages.";
exit 0; return 0;
fi fi
# transfer new packages using rsync # transfer new packages using rsync
rsync --ignore-existing --progress --human-readable \ rsync --ignore-existing --progress --human-readable \
./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit ./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || return $?
# transfer new-pkg.txt # transfer new-pkg.txt
rsync --ignore-times --checksum --progress --human-readable \ rsync --ignore-times --checksum --progress --human-readable \
new-pkg.txt "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit new-pkg.txt "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || return $?
# add each new package to database # add each new package to database
ssh "${REMOTE_SSH_HOST}" "/usr/bin/arch-repo-receive-new" || exit ssh "${REMOTE_SSH_HOST}" "/usr/bin/arch-repo-receive-new" || return $?
} }