projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another attempt to get the uptime right.
[feisty_meow.git]
/
scripts
/
rev_control
/
push_repo_upstream.sh
diff --git
a/scripts/rev_control/push_repo_upstream.sh
b/scripts/rev_control/push_repo_upstream.sh
index 13e8ba0e0232e197b272da076b247cc6f7f3a30b..338e0bf442282da009c8f77e528a865d13ea13ff 100755
(executable)
--- 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
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
fi
pushd "$dir"
git fetch upstream
git merge upstream/master
-git push origin master
+unset GIT_SSH
+git push origin master <"$PASSWORD_FILE"
popd
popd
+
+