| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | scripts/Makefile.am | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pacman-key.sh.in | 18 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 2 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 2 |
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7c64e81c..daa5b2ae 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,7 @@ edit = sed \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ - -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the @@ -66,7 +66,7 @@ $(OURSCRIPTS): Makefile makepkg: $(srcdir)/makepkg.sh.in pacman-db-upgrade: $(srcdir)/pacman-db-upgrade.sh.in -pacman-key: ${srcdir}/pacman-key.sh.in +pacman-key: $(srcdir)/pacman-key.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in pkgdelta: $(srcdir)/pkgdelta.sh.in rankmirrors: $(srcdir)/rankmirrors.sh.in diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 34be1e69..419036dc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1252,7 +1252,7 @@ create_srcpackage() { local i for i in 'changelog' 'install'; do - local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in $filelist; do # evaluate any bash variables used diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index c0929897..20ec20fa 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -4,7 +4,7 @@ # Based on apt-key, from Debian # @configure_input@ # -# Copyright (c) 2010 - Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org> # # 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 @@ -56,7 +56,7 @@ usage() { 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" - echo "$(gettext " --gpgdir Set an alternate directory for gnupg")" + printf "$(gettext " --gpgdir Set an alternate directory for gnupg (instead of '%s')")\n" "$PACMAN_KEYRING_DIR" echo echo "$(gettext "The available commands are:")" echo "$(gettext " -a, --add [<file(s)>] Add the specified keys (empty for stdin)")" @@ -87,12 +87,12 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # 'key', 'equal sign' and 'value' can be surrounded by random whitespace # Usage: get_from "$file" "$key" # returns the value for the first matching key in the file get_from() { - while read key _ value; do - if [[ $key = $2 ]]; then - echo "$value" - break - fi - done < "$1" + while read key _ value; do + if [[ $key = $2 ]]; then + echo "$value" + break + fi + done < "$1" } reload_keyring() { @@ -328,3 +328,5 @@ case "${command}" in error "$(gettext "Unknown command:") $command" usage; exit 1 ;; esac + +# vim: set ts=2 sw=2 noet: diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index ecca4277..d17b41d2 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -163,3 +163,5 @@ if ! type xdelta3 &>/dev/null; then fi create_xdelta "$1" "$2" + +# vim: set ts=2 sw=2 noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 820db369..0ffc0df5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -361,7 +361,7 @@ db_write_entry() msg2 "$(gettext "Creating '%s' db entry...")" 'files' local files_path="$tmpdir/$pkgname-$pkgver/files" echo "%FILES%" >$files_path - bsdtar --exclude='.*' -tf "$pkgfile" >>$files_path + bsdtar --exclude='^.*' -tf "$pkgfile" >>$files_path fi # create a delta file |