X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_upstream.sh;h=338e0bf442282da009c8f77e528a865d13ea13ff;hb=11c025412b185935e3a54cadfe8a74607d37f34d;hp=6210277e7a3eeb29490f3e0bb42c371a3c56906c;hpb=159dcfbd3eecd9f4f0a1f4baa4b6e20af520045d;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_upstream.sh b/scripts/rev_control/push_repo_upstream.sh index 6210277e..338e0bf4 100755 --- a/scripts/rev_control/push_repo_upstream.sh +++ b/scripts/rev_control/push_repo_upstream.sh @@ -15,8 +15,20 @@ if [ -z "$dir" ]; then dir=. fi +# 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 origin master +unset GIT_SSH +git push origin master <"$PASSWORD_FILE" popd + +