- testmvpkg, mvpkg check signature only when moving to PLD repo (arekm)

- remove glen specific aliases (no longer needed)

Changed files:
    shell/bashrc -> 1.9

diff --git a/shell/bashrc b/shell/bashrc
index ce6791e5b5497fb57a27db5dbbbb8b4eb4809688..039b5e4f53fcefe23f04c5b099ce86e43dce7629 100644 (file)
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -6,10 +6,14 @@ alias gen-indexes=~/pld-ftp-admin/scripts/gen-indexes.py
 alias dump-locks=~/pld-ftp-admin/scripts/dump-locks.py
 
 testmvpkg() {
+       from="$1"
+       to="$2"
        ~/pld-ftp-admin/scripts/test-move.py "$@" || return $?
        shift 2
-       echo >&2 "Checking signatures"
-       testsignpkg "$@" || return $?
+       if [ "$to" = "PLD" ]; then
+               echo >&2 "Checking signatures"
+               testsignpkg "$@" || return $?
+       fi
 }
 
 mvpkg() {
@@ -17,7 +21,9 @@ mvpkg() {
                shift 2
                testsignpkg "$@" || return $?
        }
-       __wrap_signpkg "$@" || return $?
+       if [ "$2" = "PLD" ]; then
+               __wrap_signpkg "$@" || return $?
+       fi
        ~/pld-ftp-admin/scripts/move.py "$@" || return $?
 }
 
@@ -29,12 +35,6 @@ alias df='df -Th'
 alias vi='vim'
 alias h='history $(($LINES-6))'
 
-# glen ;)
-if [ "${SSH_CONNECTION%% *}" = "194.106.120.90" ]; then
-       [ -f ~/okas/bashrc ] && . ~/okas/bashrc
-       [ -x ~/okas/cvsstat ] && alias cvsstat=~/okas/cvsstat
-fi
-
 cp-kde-i18n() {
        sarch=amd64
        info=$1