[pLog-svn] r6709 - templates/branches/lifetype-1.2/bin

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2008-07-25 14:46:09 -0400 (Fri, 25 Jul 2008)
New Revision: 6709

Modified:
   templates/branches/lifetype-1.2/bin/build.sh
Log:
merged from plugin script

Modified: templates/branches/lifetype-1.2/bin/build.sh
===================================================================
--- templates/branches/lifetype-1.2/bin/build.sh	2008-07-25 18:44:01 UTC (rev 6708)
+++ templates/branches/lifetype-1.2/bin/build.sh	2008-07-25 18:46:09 UTC (rev 6709)
@@ -49,11 +49,15 @@
 # get the name of the template that we're trying to build
 if [ "${1:-}" == "noupload" ]; then
   message "Building, not uploading";
-  UPLOAD=0
+  UPLOAD=""
   TEMPLATENAME=$2
 else
-  message "Building and uploading";
-  UPLOAD=1
+  message "Building and uploading, please type your sourceforge username"
+  read UPLOAD
+  if [ "${UPLOAD:-}" == "" ]; then
+    error "A sourceforge username is required to upload, or else use 'noupload'."
+    exit
+  fi
   TEMPLATENAME=$1
 fi
 
@@ -83,13 +87,15 @@
     zip -r ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip ${TEMPLATENAME}/
 fi
 
-if [ "$UPLOAD" == "1" ]; then
+if [ "$UPLOAD" != "" ]; then
   # upload the package.  Linux ftp (at least my version, doesn't have the -a command,
   # but I can use curl to do the same thing.
   if [ `uname` == "Linux" ]; then
-    curl --upload-file ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip --user anonymous:lifetype-uploads at jon.limedaley.com ftp://upload.sf.net/incoming/
+    curl --upload-file ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip -u $UPLOAD sftp://frs.sourceforge.net/~/uploads/
   else
-    ftp -a -u ftp://upload.sourceforge.net/incoming/${VERSION}_${TEMPLATENAME}.zip ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip
+# I think only oscar used this - he'll need to fix it
+#    ftp -a -u ftp://upload.sourceforge.net/incoming/${VERSION}_${TEMPLATENAME}.zip ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip
+    echo "fix me.  Sourceforge changed how they do uploads"
   fi
 fi
 


Property changes on: templates/branches/lifetype-1.2/bin/build.sh
___________________________________________________________________
Added: svn:mergeinfo
   + /plugins/branches/lifetype-1.2/bin/build.sh:6707-6708