From ef83090667709dde11a31c2fb822e5bdafa3c63d Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 21 Mar 2013 20:46:26 -0400 Subject: [PATCH] still trying to get this down, but it seems to need expect for the password handling. git ignores stdin. --- scripts/rev_control/push_repo_upstream.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/rev_control/push_repo_upstream.sh b/scripts/rev_control/push_repo_upstream.sh index 5b99f3b9..338e0bf4 100755 --- a/scripts/rev_control/push_repo_upstream.sh +++ b/scripts/rev_control/push_repo_upstream.sh @@ -14,13 +14,21 @@ dir="$1"; shift if [ -z "$dir" ]; then dir=. fi -certfile="$1"; shift -if [ -z "$certfile" ]; then - certfile=$HOME/.ssh/id_dsa_sourceforge + +# this file needs to have our sourceforge password in it. +PASSWORD_FILE="$HOME/.secrets/sourceforge_password" + +if [ ! -f "$PASSWORD_FILE" ]; then + echo "This script requires a password stored in the file:" + echo " $PASSWORD_FILE" + exit 1 fi pushd "$dir" git fetch upstream git merge upstream/master -git push -i "$certfile" origin master +unset GIT_SSH +git push origin master <"$PASSWORD_FILE" popd + + -- 2.34.1