X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_upstream.sh;h=338e0bf442282da009c8f77e528a865d13ea13ff;hb=11c025412b185935e3a54cadfe8a74607d37f34d;hp=3d69f95f63f6cec3c853e122c07091668d9938dd;hpb=1abc7c0a32c98db6dfbc0ceadbc30a72c54bb13e;p=feisty_meow.git

diff --git a/scripts/rev_control/push_repo_upstream.sh b/scripts/rev_control/push_repo_upstream.sh
index 3d69f95f..338e0bf4 100755
--- a/scripts/rev_control/push_repo_upstream.sh
+++ b/scripts/rev_control/push_repo_upstream.sh
@@ -10,8 +10,25 @@
 # rats: how did i set up that archive?
 #       we need to have those steps someplace.
 
+dir="$1"; shift
+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
+unset GIT_SSH
+git push origin master <"$PASSWORD_FILE"
+popd
 
-git push origin master