- existence check

[projects/pld-ftp-admin.git] / shell / bashrc

diff --git a/shell/bashrc b/shell/bashrc
index 60a1996abf4128c232cd8f7233866c30be4cc175..6a47a921d07807fe14fc34c55d8d248c89a4814a 100644 (file)
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -30,8 +30,8 @@ alias h='history $(($LINES-6))'
 
 # glen ;)
 if [ "${SSH_CONNECTION%% *}" = "194.106.120.90" ]; then
-       . ~/okas/bashrc
-       alias cvsstat=~/okas/cvsstat
+       [ -f ~/okas/bashrc ] && . ~/okas/bashrc
+       [ -x ~/okas/cvsstat ] && alias cvsstat=~/okas/cvsstat
 fi
 
 cp-kde-i18n() {
@@ -54,9 +54,11 @@ signpkg() {
                echo >&2 "signpkg: Specify existing info file"
                return
        fi
+       local key=$(rpm -E '%_gpg_name')
        awk -F: '/^file:/{arch=$2; file=$3; printf("../../%s/RPMS/%s\n", arch, file)}' "$@" | \
-       xargs -l512 \
-       rpm --resign
+       xargs -l1 -ri rpm -qp --qf '{} %{SIGGPG:pgpsig}\n' {} 2>/dev/null | \
+       awk -vk="$key" '$NF ~ k {print > "/dev/stderr"; next} {print $1}' | \
+       xargs -l512 -r rpm --resign
 }
 
 testsignpkg() {