- shell versions of move and remove go bye bye

Changed files:
    bin/move.sh -> 1.12
    bin/remove.sh -> 1.6

diff --git a/bin/move.sh b/bin/move.sh
deleted file mode 100755 (executable)
index cfe81d7..0000000
--- a/bin/move.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-. ~/pld-ftp-admin/scripts/functions
-
-if [ "$#" -lt "3" ]; then
-       echo "Not enough parameters given"
-       echo "move.sh src-tree dst-tree package1 [package2...]"
-       exit
-fi
-
-if [ ! -d "$FTP_DIR/$1" ]; then
-       echo "$FTP_DIR/$1 does not exit"
-       exit
-fi
-
-if [ ! -d "$FTP_DIR/$2" ]; then
-       echo "$FTP_DIR/$2 does not exit"
-       exit
-fi
-
-# we set $srctree, $dsttree and $pkglist
-srctree=$1
-dsttree=$2
-shift 2
-
-init_pkglist "$srctree" "$*"
-
-if [ "$errnum" != "0" ]; then
-       echo "$errnum error(s) encountered... aborting"
-       exit
-fi
-
-check_buildids "$srctree"
-
-if [ "$errnum" != "0" ]; then
-       echo "$errnum error(s) encountered... aborting"
-       exit
-fi
-
-check_built_archs
-
-if [ "$errnum" != "0" ]; then
-       echo "$errnum error(s) encountered... aborting"
-       exit
-fi
-
-# Remove packages older than the ones we're moving in $srctree tree
-olderpkgs=`find_older_pkgs "$srctree" "$pkglist"`
-remove_pkgs "$srctree" "$olderpkgs"
-
-# Remove old packages in destination tree
-olderpkgs=`find_other_pkgs "$dsttree" "$pkglist"`
-remove_pkgs "$dsttree" "$olderpkgs"
-
-# Move the new packages
-cd "$FTP_DIR/$srctree/SRPMS/.metadata/"
-for pkg in $pkglist; do
-       # First we check if the package is already there
-       dstinfo="$FTP_DIR/$dsttree/SRPMS/.metadata/$pkg.src.rpm.info"
-       if [ -f "$dstinfo" ]; then
-               archs=`grep '^file:' "$pkg.src.rpm.info"|cut -d: -f 2|sort|uniq`
-               for arch in $archs; do
-                       if [ -n "`grep ^file:$arch: $dstinfo`" ]; then
-                               # This arch is already in dest tree
-                               echo "Arch $arch for package $pkg is already present in tree $dsttree; removing from $srctree"
-                               continue
-                       fi
-                       # Add missing archs
-                       for i in `grep "^file:$arch:" "$pkg.src.rpm.info"|cut -d: -f 3`; do
-                               mv "$FTP_DIR/$srctree/$arch/RPMS/$i" "$FTP_DIR/$dsttree/$arch/RPMS/"
-                               echo "file:$arch:$i" >>$dstinfo
-                       done
-                       # Remove the 'old' package; we use 'force' option to ommit
-                       # errors that would show up for already moved rpms
-                       remove_pkgs "$srctree" "$pkg" "force"
-               done
-       else
-               # No previous file found; just move the rpms
-               for i in `grep '^file:' "$pkg.src.rpm.info"`; do
-                       arch=`echo $i|cut -d: -f 2`
-                       file=`echo $i|cut -d: -f 3`
-                       mv "$FTP_DIR/$srctree/$arch/RPMS/$file" "$FTP_DIR/$dsttree/$arch/RPMS/"
-               done
-               # And move the .info file
-               mv "$pkg.src.rpm.info" "$FTP_DIR/$dsttree/SRPMS/.metadata/"
-       fi
-done
-

diff --git a/bin/remove.sh b/bin/remove.sh
deleted file mode 100755 (executable)
index 95c140c..0000000
--- a/bin/remove.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-. ~/pld-ftp-admin/scripts/functions
-
-case "$1" in
-       -o | --older )
-       shift
-       REMOVEOLDER=yes
-       ;;
-esac   
-
-if [ "$#" -lt "2" ]; then
-       echo "Not enough parameters given"
-       echo "remove.sh [option] tree package1 [package2...]"
-       echo " "
-       echo "Valid options:"
-       echo "    -o, --older         - Also remove older packages"
-       exit
-fi
-
-if [ ! -d "$FTP_DIR/$1" ]; then
-       echo "$FTP_DIR/$1 does not exit"
-       exit
-fi
-
-# we set $tree and $pkglist
-tree=$1
-shift 1
-
-init_pkglist "$tree" "$*"
-
-if [ "$errnum" != "0" ]; then
-       echo "$errnum error(s) encountered... aborting"
-       exit
-fi
-
-if [ "$REMOVEOLDER" == "yes" ]; then
-       # Remove packages older than the ones we're removing
-       olderpkgs=`find_older_pkgs "$tree" "$pkglist"`
-       remove_pkgs "$tree" "$olderpkgs"
-fi
-
-# Remove given packages
-remove_pkgs "$tree" "$pkglist"
-