X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pull-usrlocalsrc;h=ef9167b7f70561a8ac522b1400adda822c7cae33;hb=682002cec47ddc2bacdb64c636d5df581a1029b4;hp=2f4c029cb6a4b1d26d8d420a6b99393e29e2246f;hpb=9c97e2737a3465ed07137b8591a9adec85d45351;p=git-scripts.git

diff --git a/pull-usrlocalsrc b/pull-usrlocalsrc
index 2f4c029..ef9167b 100755
--- a/pull-usrlocalsrc
+++ b/pull-usrlocalsrc
@@ -1,9 +1,18 @@
 #! /bin/sh
 
+has_remote() {
+   git remote show "$1" >/dev/null 2>&1
+}
+
 prog_dir="`dirname \"$0\"`" &&
 
 cat "$prog_dir"/locate-all.list | grep -F /usr/local/src |
-while true; do
-   read d || exit 0
-   echo "----- $d -----"; cd "$d" && git pull origin || exit 1
+while read d; do
+   echo "----- $d -----"; cd "$d" &&
+   if has_remote upstream && has_remote origin; then
+      { git pull upstream master || git pull upstream main:master; } &&
+         git push origin master || exit 1
+   elif has_remote origin; then
+      git pull origin master || exit 1
+   fi
 done