diff options
| author | paulbdavis | 2018-02-25 14:37:02 -0700 |
|---|---|---|
| committer | paulbdavis | 2018-02-25 14:37:02 -0700 |
| commit | ef29421a406e480a7b08d2a34f06ac2d25545ff8 (patch) | |
| tree | a2ce3bf111d8edc0d4ce162220448925f5cc5573 | |
| parent | 970e03649bab1d2442edeb95d9b80b8df89c2bfb (diff) | |
| download | aur-ef29421a406e480a7b08d2a34f06ac2d25545ff8.tar.gz | |
tru that again
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | reposync.sh | 24 |
3 files changed, 13 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = reposync pkgdesc = Wrapper for aursync - pkgver = 0.0.14 + pkgver = 0.0.15 pkgrel = 1 arch = any license = MIT @@ -9,7 +9,7 @@ pkgbase = reposync depends = bash depends = s3fs-fuse source = reposync.sh - sha256sums = e0384d1fd771812c245355d974a9f4906fa0874caf8433f8283d23f8102366d3 + sha256sums = eddbff5838f019d26eda32dee89b603e377f9efc906960bf533db1dedbd8a3e6 pkgname = reposync @@ -1,12 +1,12 @@ # Maintainer: Paul Davis <paul@dangersalad.com> pkgname=reposync -pkgver=0.0.14 +pkgver=0.0.15 pkgrel=1 arch=('any') license=('MIT') source=(reposync.sh) pkgdesc="Wrapper for aursync" -sha256sums=('e0384d1fd771812c245355d974a9f4906fa0874caf8433f8283d23f8102366d3') +sha256sums=('eddbff5838f019d26eda32dee89b603e377f9efc906960bf533db1dedbd8a3e6') depends=('aurutils' 'sudo' 'bash' 's3fs-fuse') package () { diff --git a/reposync.sh b/reposync.sh index 63457b8149cc..be6a3ab9f75d 100644 --- a/reposync.sh +++ b/reposync.sh @@ -61,10 +61,15 @@ files_remote_name="${repo_name}.files" echo "Adding $pkg" repo-add "$db_local_name" "$pkg" done - rm -f "${db_remote_name}.sig" - gpg --output "${db_remote_name}.sig" --detach-sign "$db_local_name" - rm -f "${files_remote_name}.sig" - gpg --output "${files_remote_name}.sig" --detach-sign "$files_local_name" + # copy newly generated database files to their remote location + mv "$db_local_name" "$db_remote_name" + mv "$files_local_name" "$files_remote_name" + # remove all the extras + rm -f "${db_remote_name}".* + rm -f "${files_remote_name}".* + # generate new signatures + gpg --output "${db_remote_name}.sig" --detach-sign "$db_remote_name" + gpg --output "${files_remote_name}.sig" --detach-sign "$files_remote_name" ) echo "Performing system update" @@ -73,17 +78,6 @@ sudo pacman -Syu echo "Performing repository sync" aursync --sign --repo "$repo_name" --root "$local_repo" -u $@ -( - - cd "$local_repo" - rm -f "$db_remote_name" "${db_remote_name}.sig" - rm -f "$files_remote_name" "${files_remote_name}.sig" - cp -af "$db_local_name" "$db_remote_name" - cp -af "${db_local_name}.sig" "${db_remote_name}.sig" - cp -af "$files_local_name" "$files_remote_name" - cp -af "${files_local_name}.sig" "${files_remote_name}.sig" -) - echo "Syncing local repo to remote" echo "$local_repo/ -> $remote_repo/" $do_rsync "$local_repo/" "$remote_repo/" |