From f87a62399ab54d8bcf25a2324d939e6ba6f62f44 Mon Sep 17 00:00:00 2001
From: Mariusz Mazur <mmazur@pld-linux.org>
Date: Sat, 18 Sep 2004 13:21:40 +0000
Subject: [PATCH] - more changes

Changed files:
    bin/config -> 1.2
    bin/from-incoming.sh -> 1.6
    bin/functions -> 1.1
    bin/move.sh -> 1.5
---
 bin/config           |  8 --------
 bin/from-incoming.sh | 10 ++++++----
 bin/functions        | 18 ++++++++++++++++++
 bin/move.sh          |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 bin/config
 create mode 100644 bin/functions

diff --git a/bin/config b/bin/config
deleted file mode 100644
index 1f99bea..0000000
--- a/bin/config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if [ ! -f ~/.ftpadmrc ]; then
-	echo "Config not found"
-	exit
-fi
-
-. ~/.ftpadmrc
-
diff --git a/bin/from-incoming.sh b/bin/from-incoming.sh
index 789345b..caa4f81 100755
--- a/bin/from-incoming.sh
+++ b/bin/from-incoming.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-. ~/pld-ftp-admin/scripts/config
+. ~/pld-ftp-admin/scripts/functions
+
 
 cd $INCOMING_DIR/SRPMS
 for i in *uploadinfo; do
@@ -15,8 +16,9 @@ for i in *uploadinfo; do
 
 	srcname=`cat $i|grep '^file:SRPMS'|cut -d: -f 3`
 	if [ -f $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info ]; then
-		# TODO: Do something more interesting here
-		echo "$srcname.info in $DEFAULT_TO already exists"
+		log "$srcname.info already present in $DEFAULT_TO; newer version removed"
+		rm $srcname
+		rm $i
 		continue
 	fi
 
@@ -40,7 +42,7 @@ for arch in $ARCHS; do
 
 		srcname=`cat $i|grep '^file:SRPMS'|cut -d: -f 3`
 		if [ ! -f $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info ]; then
-			# TODO: Do something more interesting here
+			# TODO: Do something more interesting here... or not
 			continue
 		fi
 
diff --git a/bin/functions b/bin/functions
new file mode 100644
index 0000000..191a8c0
--- /dev/null
+++ b/bin/functions
@@ -0,0 +1,18 @@
+
+# Read config
+if [ ! -f ~/.ftpadmrc ]; then
+	echo "Config not found"
+	exit
+fi
+
+. ~/.ftpadmrc
+
+# For logging
+scriptname=`basename $0`
+
+# Log a message... useful for debugging
+log() {
+	echo `date "+%F %T"` "[$scriptname]" "--" "$@" >>~/pld-ftp-admin/log
+}
+
+# vi: syntax=sh
diff --git a/bin/move.sh b/bin/move.sh
index 177093f..06760ff 100755
--- a/bin/move.sh
+++ b/bin/move.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ~/pld-ftp-admin/scripts/config
+. ~/pld-ftp-admin/scripts/functions
 
 if [ "$#" -lt "3" ]; then
 	echo "Not enough parameters given"
-- 
2.44.0