index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | scripts/pacman-key.sh.in | 2 | ||||
-rw-r--r-- | scripts/repo-add.sh.in | 6 |
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 877cca29..833943cb 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -33,7 +33,7 @@ usage() { echo printf "$(gettext "Usage: %s [options] <command> [arguments]")\n" $(basename $0) echo - echo "$(gettext "Manage pacman's list of trusted keys")" + printf "$(gettext "Manage pacman\'s list of trusted keys")\n" echo echo "$(gettext "Options must be placed before commands. The available options are:")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$CONFIG" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 415ad41f..474e21d9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -642,7 +642,11 @@ if (( success )); then create_signature "$tmpdir/$filename" [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" - [[ -f $REPO_DB_FILE.sig ]] && rm -f "$REPO_DB_FILE.sig" + if [[ -f $REPO_DB_FILE.sig ]]; then + mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" + else + rm -f "$REPO_DB_FILE.old.sig" + fi [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" dblink="${REPO_DB_FILE%.tar*}" |