Place the github secrets in ~/.netrc

which is a standard location and you will not commit them accidentally

github-scripts/github-create-email-hook

@@ -17,7 +17,7 @@ do
   }
 EOJSON
 
-  curl -s -u ${username}:${password} -X POST -d @${json}  https://api.github.com/repos/${organization}/${repo}/hooks -o ${json}.result
+  curl -s -n -X POST -d @${json}  https://api.github.com/repos/${organization}/${repo}/hooks -o ${json}.result
 done
 
 

github-scripts/github-disable-email-hook

@@ -1,15 +1,21 @@
 #!/bin/bash
+# When recovering the broken svn-git migration,
+# we needed to temporarily disable the commit email notifications.
+
+# Stop on errors.
 set -e
+
+# Check that ~/.netrc knows github
 . github-secrets
 
 organization="yast"
-# http://zq1.de/bernhard/yast-broken-list.txt
+# Get the list from http://zq1.de/bernhard/yast-broken-list.txt
 repolist=`sed 's/^/yast-/' yast-broken-list.txt`
 
 for repo in $repolist
 do
   echo -n $repo...
-  curl -f -s -u ${username}:${password} https://api.github.com/repos/${organization}/${repo}/hooks -o ${json}.list
+  curl -f -s -n https://api.github.com/repos/${organization}/${repo}/hooks -o ${json}.list
   if [ $(grep '"id"' ${json}.list | wc -l) != 1 ]; then
 	  echo "$repo has more than one hook. fix manually"
 	  touch ${repo}.error
@@ -26,8 +32,6 @@ do
   }
   }
 EOJSON
-  curl -f -s -u ${username}:${password} -X PATCH -d @${json}  https://api.github.com/repos/${organization}/${repo}/hooks/$ID -o ${json}.result
+  curl -f -s -n -X PATCH -d @${json}  https://api.github.com/repos/${organization}/${repo}/hooks/$ID -o ${json}.result
   echo " OK"
 done
-
-

github-scripts/github-secrets

@@ -1,3 +1,10 @@
-username="johndoe"
-password="yourpassword"
-
+# This file used to define the shell variables `username` and `password`
+# but then they would show up in output of `ps`, `bash -x`...
+# It is better to use `~/.netrc` which `curl -n` will use.
+if ! grep -qs api.github.com ~/.netrc; then
+    echo "Set up your Github credentials first:"
+    echo "  : >> ~/.netrc"
+    echo "  chmod 600 ~/.netrc"
+    echo "  echo 'machine api.github.com login USER password PASSWORD' >> ~/.netrc"
+    exit 1
+fi