tei-install.sh diff

gistfile1.diff

--- P5/Utilities/.svn/text-base/tei-install.sh.svn-base  Thu Nov 15 13:45:04 2012
+++ P5/Utilities/.svn/tmp/tei-install.sh.tmp	Thu Jan 17 14:05:10 2013
@@ -51,7 +51,6 @@
   Roma)          name=Roma;        pname=tei-roma;;
     *) echo "Error: package $package unsupported"; exit 1;;
 esac
-rm -f ${pname}-${version}.zip
 ${ECHO} curl -O -s $dir/${pname}-${version}.zip || \
     die "Unable to fetch package $dir/${pname}-${version}.zip"
 ${ECHO} mkdir -p ${Vault}/${name}/${version}
@@ -60,9 +59,11 @@
 ${ECHO} rm ${Vault}/${name}/current
 echo link ${Vault}/${name}/${version} to ${Vault}/${name}/current
 ${ECHO} ln -s ${Vault}/${name}/${version} ${Vault}/${name}/current
+${ECHO} rsync -e ssh ${pname}-${version}.zip ${SFUSER},tei@frs.sourceforge.net:/home/frs/project/t/te/tei/${SFNAME}/${pname}-${version}.zip
+<<<<<<< .mine
 echo upload ${pname}-${version}.zip to Sourceforge ${SFNAME} as user ${SFUSER}
-${ECHO} rsync -e ssh ${pname}-${version}.zip ${SFUSER},tei@frs.sourceforge.net:/home/frs/project/t/te/tei/${SFNAME}/${pname}-${version}.zip
-${ECHO} rm ${pname}-${version}.zip 
+=======
+>>>>>>> .r11451
 
 case $package in 
   Roma)
@@ -75,3 +76,4 @@
 	${ECHO} unzip -q -o teiwebsiteguidelines -d ${Vault}/${name}/${version}/doc/tei-p5-doc;
         ${ECHO} rm teiwebsiteguidelines.zip;;
 esac
+${ECHO} rm ${pname}-${version}.zip