diff options
| author | Dan McGee <dan@archlinux.org> | 2010-08-23 21:53:06 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-08-23 21:53:06 -0500 |
| commit | 8d88f0c897e5dd531a2c74dd2bca56db56a3c63d (patch) | |
| tree | 9c22fe9b4b38d3761458434c51e25959945e4cd4 /scripts | |
| parent | a28868eeae98b28c00f8112e8d81403ad21a3117 (diff) | |
| parent | 3de32a08126480f2a9cd67d09ef104accfde8992 (diff) | |
| download | pacman-8d88f0c897e5dd531a2c74dd2bca56db56a3c63d.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 24 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 5 |
2 files changed, 20 insertions, 9 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 272c3292..17fd5de7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), +# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization @@ -1640,12 +1640,22 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then - ALL_OFF="$(tput sgr0)" - BOLD="$(tput bold)" - BLUE="${BOLD}$(tput setaf 4)" - GREEN="${BOLD}$(tput setaf 2)" - RED="${BOLD}$(tput setaf 1)" - YELLOW="${BOLD}$(tput setaf 3)" + # prefer terminal safe colored and bold text when tput is supported + if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + RED="${BOLD}$(tput setaf 1)" + YELLOW="${BOLD}$(tput setaf 3)" + else + ALL_OFF="\033[1;0m" + BOLD="\033[1;1m" + BLUE="${BOLD}\033[1;34m" + GREEN="${BOLD}\033[1;32m" + RED="${BOLD}\033[1;31m" + YELLOW="${BOLD}\033[1;33m" + fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2838f817..283ad07a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -488,8 +488,9 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" dblink="${REPO_DB_FILE%.tar.*}" - ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ - ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + target=${REPO_DB_FILE##*/} + ln -sf "$target" "$dblink" 2>/dev/null || \ + ln -f "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" else msg "$(gettext "No packages modified, nothing to do.")" |