From 2973ef8ff38acfc3902b22cad29ddc59d47abdf1 Mon Sep 17 00:00:00 2001
From: Jorrit Wronski <jowr@mek.dtu.dk>
Date: Mon, 8 Dec 2014 10:28:57 +0100
Subject: [PATCH] More fiddling with the SSH keys.

---
 dev/scripts/gitMirror.bsh | 11 +++--------
 dev/scripts/release.bsh   |  8 +++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/dev/scripts/gitMirror.bsh b/dev/scripts/gitMirror.bsh
index 5dbef444..94829699 100644
--- a/dev/scripts/gitMirror.bsh
+++ b/dev/scripts/gitMirror.bsh
@@ -4,11 +4,9 @@
 USER=coolprop
 source /home/$USER/.bash_profile
 #
-SFPASS="/home/$USER/etc_opt/id_jorritw"
-#
 FOLDER="/home/$USER/src/CoolProp.git"
 ORIGIN="https://github.com/CoolProp/CoolProp.git"
-MIRROR="ssh://jorritw@git.code.sf.net/p/coolprop/git"
+MIRROR="ssh://git.code.sf.net-jorritw/p/coolprop/git"
 #
 if [ ! -d $FOLDER ]; then # repo does not exist, clone it
     BASEFOLDER=${FOLDER%/*}
@@ -21,11 +19,8 @@ if [ ! -d $FOLDER ]; then # repo does not exist, clone it
     #popd
     popd
 fi
-echo "Preparing the ssh key for SourceForge"
-eval $(ssh-agent) # Make sure ssh-agent is running
-ssh-add "$SFPASS"
 pushd $FOLDER
-#git push --force --mirror
-git push --mirror $MIRROR
+git fetch $ORIGIN 
+git push --force --mirror $MIRROR
 popd
 exit 0
diff --git a/dev/scripts/release.bsh b/dev/scripts/release.bsh
index 32eb9eb7..f0ffeea8 100755
--- a/dev/scripts/release.bsh
+++ b/dev/scripts/release.bsh
@@ -46,14 +46,12 @@ else
     #
     RSYNC_DRY_RUN=
 fi
-echo "Preparing the ssh key for SourceForge"
-eval $(ssh-agent) # Make sure ssh-agent is running
-ssh-add "$SFPASS"
 #
+RSYNC_AUTH="-e \"ssh -i $SFPASS\""
 echo "Copying the binaries to SourceForge"
-rsync $RSYNC_DRY_RUN -a --no-perms -z --stats "$BINFOLDER/" $SFUSER@frs.sourceforge.net:/home/frs/project/coolprop/CoolProp/$CPVERSION
+rsync $RSYNC_AUTH $RSYNC_DRY_RUN -a --no-perms -z --stats "$BINFOLDER/" $SFUSER@frs.sourceforge.net:/home/frs/project/coolprop/CoolProp/$CPVERSION
 echo "Publishing the docs on SourceForge"
-rsync $RSYNC_DRY_RUN -a --no-perms -z --stats "$DOCFOLDER/" $SFUSER@web.sourceforge.net:/home/project-web/coolprop/htdocs
+rsync $RSYNC_AUTH $RSYNC_DRY_RUN -a --no-perms -z --stats "$DOCFOLDER/" $SFUSER@web.sourceforge.net:/home/project-web/coolprop/htdocs
 # Change back to where we came from
 popd
 echo "All done, goodbye."