Remove hardcoded user.

Author: toad

insert-update-ext

@@ -4,10 +4,10 @@ source ~/bin/insert-update-keys
 VERSION=12
 FILENAME=/var/lib/freenet-experimental/freenet-ext.${VERSION}.jar
 rsync emu.freenetproject.org:/var/www/downloads/alpha/freenet-ext.jar ${FILENAME}
-/root/bin/insert-update-inner 9481 $FILENAME "${OLDKEY}/ext-$VERSION" ext-update-old-$VERSION 1 &
-/root/bin/insert-update-inner 9481 $FILENAME "${NEWKEY}/ext-$VERSION" ext-update-new-$VERSION 0 &
-/root/bin/insert-update-inner 7482 $FILENAME "${OLDKEY}/ext-$VERSION" ext-update-old-$VERSION 1 &
-/root/bin/insert-update-inner 7482 $FILENAME "${NEWKEY}/ext-$VERSION" ext-update-new-$VERSION 0 &
+insert-update-inner 9481 $FILENAME "${OLDKEY}/ext-$VERSION" ext-update-old-$VERSION 1 &
+insert-update-inner 9481 $FILENAME "${NEWKEY}/ext-$VERSION" ext-update-new-$VERSION 0 &
+insert-update-inner 7482 $FILENAME "${OLDKEY}/ext-$VERSION" ext-update-old-$VERSION 1 &
+insert-update-inner 7482 $FILENAME "${NEWKEY}/ext-$VERSION" ext-update-new-$VERSION 0 &
 
 jobs
 wait %1

release-build

@@ -85,7 +85,7 @@ cp freenet-${GITVERSION}-source.tar.bz2* /usr/src/cvs/eclipse-workspace/FreenetR
 echo Uploaded source code to emu
 rm -Rf $TEMPLOC
 cd
-/root/bin/compare-l10n ${VERSION}
+compare-l10n ${VERSION}
 
 # shut down the ssh agent
 if [ "${START_STOP_SSH_AGENT}" == "1" ]; then

release-installer

@@ -19,8 +19,6 @@ rsync /usr/src/cvs/eclipse-workspace/app-new_installer/scripts/update.* /usr/src
 cp new_installer_offline.jar new_installer_offline_${VERSION}.jar
 cp new_installer_offline.jar.sig new_installer_offline_${VERSION}.jar.sig
 ls -l new_installer_offline_${VERSION}.jar
-#echo /root/bin/googlecode_upload.py -s "Freenet installer for build $VERSION" -p freenet -u matthew.toseland new_installer_offline_${VERSION}.jar
-#/root/bin/googlecode_upload.py -s "Freenet installer for build $VERSION" -p freenet -u matthew.toseland new_installer_offline_${VERSION}.jar || exit
 cp new_installer_offline_${VERSION}.jar new_installer_offline_${VERSION}.jar.sig ~browser/
 cp new_installer_offline_${VERSION}.jar* /usr/src/cvs/eclipse-workspace/FreenetReleased/
 rm new_installer_offline_${VERSION}.jar new_installer_offline_${VERSION}.jar.sig

release-wininstaller

@@ -44,7 +44,7 @@ kill -9 `pgrep -u freenet-buildwin`
 cd
 mkdir -p tmp-wi
 cd tmp-wi
-rm /root/tmp-wi/*
+rm *
 cp ~freenet-buildwin/tmp/app-wininstaller/bin/FreenetInstaller.exe FreenetInstaller-${VERSION}.exe
 cd ~freenet-buildwin/tmp/app-wininstaller/res/install_node/updater/ || exit
 cp update.cmd update-new.cmd || exit
@@ -64,7 +64,6 @@ echo Signing
 su - toad -c "gpg --sign --detach-sign FreenetInstaller-${VERSION}.exe"
 cp ~toad/FreenetInstaller-${VERSION}.exe.sig .
 echo Uploading to Google Code
-#/root/bin/googlecode_upload.py -s "Freenet $MAINVER build $VERSION Windows installer" -p freenet -u matthew.toseland FreenetInstaller-alpha-${VERSION}.exe || exit
 cp FreenetInstaller-${VERSION}.exe ~browser/
 chmod a+r ~browser/FreenetInstaller-${VERSION}.exe
 echo Uploading to emu

testnet-wininstaller

@@ -44,7 +44,7 @@ kill -9 `pgrep -u freenet-buildwin`
 cd
 mkdir -p tmp-wi
 cd tmp-wi
-rm /root/tmp-wi/*
+rm *
 cp ~freenet-buildwin/tmp/testnet-wininstaller/bin/TestnetInstaller.exe TestnetInstaller-${VERSION}.exe
 cd ~freenet-buildwin/tmp/testnet-wininstaller/res/install_node/updater/ || exit
 sha1sum update-testnet.cmd > update-testnet.cmd.sha1 || exit
@@ -58,7 +58,6 @@ echo Signing
 su - toad -c "gpg --sign --detach-sign TestnetInstaller-${VERSION}.exe"
 cp ~toad/TestnetInstaller-${VERSION}.exe.sig .
 echo Uploading to Google Code
-#/root/bin/googlecode_upload.py -s "Freenet $MAINVER build $VERSION Windows installer" -p freenet -u matthew.toseland TestnetInstaller-alpha-${VERSION}.exe || exit
 cp TestnetInstaller-${VERSION}.exe ~browser/
 chmod a+r ~browser/TestnetInstaller-${VERSION}.exe
 echo Uploading to emu