From 661d93888b37ca811a24ab27250f6925ac2b5637 Mon Sep 17 00:00:00 2001
From: maniacikarus <maniacikarus@ipfire.org>
Date: Wed, 4 Mar 2009 19:35:12 +0100
Subject: [PATCH] Changed uploadsrc to use ssh instead of ftp upload

---
 lfs/Config |  1 +
 make.sh    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index aeb5325bbd..9c331abf0d 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -35,6 +35,7 @@
 #
 URL_IPFIRE  = http://source.ipfire.org/source-2.x
 URL_TOOLCHAIN = http://source.ipfire.org/toolchains
+URL_SOURCE = source.ipfire.org:/pub/source/source-2.x
 
 # Default compiler optimizations.
 #
diff --git a/make.sh b/make.sh
index 5d97c9c007..1a692c0176 100755
--- a/make.sh
+++ b/make.sh
@@ -949,21 +949,21 @@ git)
 	;;
 uploadsrc)
 	PWD=`pwd`
+	if [ -z $IPFIRE_USER ]; then
+		echo -n "You have to setup IPFIRE_USER first. See .config for details."
+		beautify message FAIL
+		exit 1
+	fi
+	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
+	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+
 	cd $BASEDIR/cache/
-	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL/$FTP_CACHE_PATH/ > /tmp/ftplist
-	for i in *; do
-		if [ "$(basename $i)" == "toolchains" ]; then continue; fi
-		grep -q $(basename $i) /tmp/ftplist
-		if [ "$?" -ne "0" ]; then
-			echo -ne "$(basename $i)"
-			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $(basename $i)
-			if [ "$?" -ne "0" ]; then
-				beautify message FAIL
-			fi
-		fi
+	for file in $(ls -1); do
+		grep -q "$file" <<<$REMOTE_FILES && continue
+		NEW_FILES="$NEW_FILES $file"
 	done
-	rm -f /tmp/ftplist
+	[ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}
+	cd $BASEDIR
 	cd $PWD
 	exit 0
 	;;
-- 
2.39.2