From a3c56c41af3a7443f4d0697c1ce7c5fc9334881d Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Sat, 5 Nov 2016 01:28:10 -0400 Subject: [PATCH] Script fixes --- arch-ppa | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/arch-ppa b/arch-ppa index ffa6306..25c8013 100755 --- a/arch-ppa +++ b/arch-ppa @@ -96,7 +96,8 @@ sign_packages() { set -e cd $(dirname $1) for pkg in "$@"; do - gpg --detach-sign --use-agent $pkg + rm -f "${pkg}.sig" + gpg -u 'ECB9B8CBAAC68C03!' --detach-sign --use-agent $pkg done ) } @@ -197,20 +198,27 @@ setup() { clean() { ( - set -e - if [ "$#" -lt 1 ]; then - echo "Must specify repository names to clean" - return 1 - fi - for repo in "$@"; do - # Clean repository and chroot - if [ -d $basedir/chroot/$repo ]; then - exe sudo rm -rf $basedir/chroot/$repo $basedir/chroot/$repo.lock - fi - if [ -d $basedir/$repo ]; then - exe rm -rf $basedir/$repo - fi - done + set -e + if [ "$#" -lt 1 ]; then + echo "Must specify repository names to clean" + return 1 + fi + for repo in "$@"; do + # Clean repository and chroot + if [ -d $basedir/chroot/$repo ]; then + # Test if chroot uses BTRFS and remove using btrfs subvolume delete + if [ `stat --format=%i $basedir/chroot/$repo` -eq 256 ] && [ `stat -f --format=%T $basedir/chroot/$repo` ] ; then + exe sudo btrfs subvolume delete $basedir/chroot/$repo + exe sudo rm $basedir/chroot/$repo.lock + # Otherwise delete using rm + else + exe sudo rm -rf $basedir/chroot/$repo $basedir/chroot/$repo.lock + fi + fi + if [ -d $basedir/$repo ]; then + exe rm -rf $basedir/$repo + fi + done ) }