From 189d30e00d570f5963455b7b5c38260bd349cb5c Mon Sep 17 00:00:00 2001
From: USER <USER@DOMAIN.com>
Date: Mon, 6 Mar 2023 20:43:23 +0000
Subject: [PATCH] .

---
 Makefile.gitshared              | 36 +++++++++++++++++++++++++++++++++
 Makefile.rootgit                | 24 ----------------------
 Makefile.rootsgit               | 24 ----------------------
 {shared => sbin}/GitClonePublic |  0
 {shared => sbin}/GitPullPublic  |  0
 shared/rGitClone                | 24 ----------------------
 shared/rGitPull                 | 19 -----------------
 7 files changed, 36 insertions(+), 91 deletions(-)
 create mode 100644 Makefile.gitshared
 delete mode 100644 Makefile.rootgit
 delete mode 100644 Makefile.rootsgit
 rename {shared => sbin}/GitClonePublic (100%)
 rename {shared => sbin}/GitPullPublic (100%)
 delete mode 100755 shared/rGitClone
 delete mode 100755 shared/rGitPull

diff --git a/Makefile.gitshared b/Makefile.gitshared
new file mode 100644
index 0000000..0c2318c
--- /dev/null
+++ b/Makefile.gitshared
@@ -0,0 +1,36 @@
+SHELL := /bin/sh
+ZPC = /zz
+MAKEFILE_NAME := $(firstword $(MAKEFILE_LIST))
+
+.PHONY: help
+help: ## Show this help
+	@egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+
+#####
+mark-complete:
+	-touch /var/tmp/${MAKEFILE_NAME}
+
+setup:
+	-(./sbin/GitCloneShared)
+	-(./sbin/GitPullShared)
+	
+transition:
+	-(/zTools/zPrivateConfig/rGitClone)
+	-(/zTools/zPrivateConfig/rGitPull)
+	-(/zTools/zPrivateConfig/rpGitClone)
+	-(/zTools/zPrivateConfig/rpGitPull)
+
+update-config: ## update global git config and ignores
+	-(cat ${ZPC}/zPrivate/gitignore/*.gitignore > ~/.gitignoreMaster)
+	-(git config --global core.excludesfile ~/.gitignoreMaster)
+	-(git config --global user.name "USER")
+	-(git config --global user.email "USER@DOMAIN.com")
+	-(git config --global init.defaultBranch main)
+	-(git config --global core.sshCommand "ssh -i ~/.mykeys/giteawrite -F /dev/null")
+
+update:
+	-(${ZPC}/zShared/sbin/GitCloneShared)
+	-(${ZPC}/zShared/sbin/GitPullShared)
+
+#####
+load-all: update-config mark-complete
diff --git a/Makefile.rootgit b/Makefile.rootgit
deleted file mode 100644
index 3355326..0000000
--- a/Makefile.rootgit
+++ /dev/null
@@ -1,24 +0,0 @@
-SHELL := /bin/sh
-ZPC = /zz
-DIGICONFIG = /home/${LOGNAME}/.config/digikamrc
-
-.PHONY: help
-help: ## Show this help
-	@egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
-
-#####
-mark-complete:
-	-touch /var/tmp/Makefile.rootgit
-
-setup:
-	-(./shared/rGitClone)
-	-(./shared/rGitPull)
-
-update:
-	-(${ZPC}/zShared/shared/rGitClone)
-	-(${ZPC}/zShared/shared/rGitPull)
-
-
-
-#####
-load-all: mark-complete
diff --git a/Makefile.rootsgit b/Makefile.rootsgit
deleted file mode 100644
index cc3ca5f..0000000
--- a/Makefile.rootsgit
+++ /dev/null
@@ -1,24 +0,0 @@
-SHELL := /bin/sh
-ZPC = /zz
-DIGICONFIG = /home/${LOGNAME}/.config/digikamrc
-
-.PHONY: help
-help: ## Show this help
-	@egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
-
-#####
-mark-complete:
-	-touch /var/tmp/Makefile.rootsgit
-
-setup:
-	-(./shared/rsGitClone)
-	-(./shared/rsGitPull)
-
-update:
-	-(${ZPC}/zShared/shared/rsGitClone)
-	-(${ZPC}/zShared/shared/rsGitPull)
-
-
-
-#####
-load-all: mark-complete
diff --git a/shared/GitClonePublic b/sbin/GitClonePublic
similarity index 100%
rename from shared/GitClonePublic
rename to sbin/GitClonePublic
diff --git a/shared/GitPullPublic b/sbin/GitPullPublic
similarity index 100%
rename from shared/GitPullPublic
rename to sbin/GitPullPublic
diff --git a/shared/rGitClone b/shared/rGitClone
deleted file mode 100755
index 7da646d..0000000
--- a/shared/rGitClone
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-echo "SCRIPT $0 starting"
-
-MYNAME=`uname -n`
-
-ZPC=/zz
-REPO='zPublic zPublicConfig zShared'
-
-
-if [ ! -d ${ZPC} ]
-then
-    mkdir ${ZPC}
-fi
-
-for i in ${REPO}
-do
-    echo $i
-    if [ ! -d ${ZPC}/$i ]
-    then
-        cd ${ZPC}
-        git clone https://github.com/spongle70/${i}.git
-    fi
-done
diff --git a/shared/rGitPull b/shared/rGitPull
deleted file mode 100755
index d916c23..0000000
--- a/shared/rGitPull
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-echo "SCRIPT $0 starting"
-
-MYNAME=`uname -n`
-
-ZPC=/zz
-REPO='zPublic zPublicConfig zShared'
-
-
-if [ -d ${ZPC} ]
-then
-    for i in `ls -d ${ZPC}/z*`
-    do
-        echo $i
-        (cd $i; git pull)
-    done
-fi
-exit 0