From cc151b5f82987bb78d4e8e5445525351b802cbcb Mon Sep 17 00:00:00 2001
From: David Carley <dacarley@gmail.com>
Date: Fri, 9 Sep 2022 03:21:56 +0000
Subject: [PATCH] Tweaks the the dev env and build system

---
 .devcontainer/install_tools.sh |  1 +
 .gitignore                     | 45 +++++++++++++++-------------------
 .vscode/settings.json          | 31 +++++++++++++++++++++++
 Makefile                       | 10 +++-----
 scripts/gplan-init-build.sh    | 30 ++++++++---------------
 5 files changed, 66 insertions(+), 51 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.devcontainer/install_tools.sh b/.devcontainer/install_tools.sh
index 938e561..5860b69 100755
--- a/.devcontainer/install_tools.sh
+++ b/.devcontainer/install_tools.sh
@@ -25,6 +25,7 @@ APT_PACKAGES=(
 	"vim"
 	"locate"
 	"sudo"
+    "sshpass"
 )
 
 apt-get update
diff --git a/.gitignore b/.gitignore
index 7ee3a22..45e4586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,26 @@
+.DS_Store
 .sconf_temp/
 .sconsign.dblite
-/build
-/dist
-/crap
-/pkg
-/mnt
-/demo
-/bbctrl-*
-node_modules
-*~
-\#*
-*.pyc
-__pycache__
-*.egg-info
-/upload
-/*.img
-/*.img.xz
-/*.img.gzip
-/*.img.bz2
-*.so
 *.deb
-*.zip
-/rpi-share
-/rpi-root
-/src/bbserial/linux-rpi-raspberrypi-kernel*
-/src/bbserial/raspberrypi-kernel*
-.vscode
+*.egg-info
 *.elf
 *.hex
+*.img
+*.img.bz2
+*.img.gzip
+*.img.xz
+*.pyc
+*.so
+*.tmp
+*.zip
+**/__pycache__
+*~
+\#*
+build
+dist
+node_modules
 null.d
+rpi-root
+rpi-share
+src/bbserial/linux-rpi-raspberrypi-kernel*
+src/bbserial/raspberrypi-kernel*
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..427acba
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,31 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/node_modules": true,
+        "**/build": true,
+        "**/dist": true,
+        "**/rpi-share": true,
+        "**/rpi-root": true
+    },
+    "search.exclude": {
+        "**/bower_components": true,
+        "**/*.code-search": true,
+        "**/node_modules": true,
+        "**/build": true,
+        "**/dist": true,
+        "**/rpi-share": true,
+        "**/rpi-root": true
+    },
+    "explorer.excludeGitIgnore": true,
+    "git.ignoredRepositories": [
+        "rpi-share/camotics",
+        "rpi-share/cbang"
+    ],
+    "git.autofetch": false,
+    "git.confirmSync": false
+}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index bfa1a8c..ebc317f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,12 +49,6 @@ $(GPLAN_TARGET): $(GPLAN_MOD)
 
 $(GPLAN_MOD): $(GPLAN_IMG)
 	./scripts/gplan-init-build.sh
-	git -C rpi-share/cbang fetch
-	git -C rpi-share/cbang reset --hard FETCH_HEAD
-	git -C rpi-share/cbang checkout 18f1e963107ef26abe750c023355a5c40dd07853
-	git -C rpi-share/camotics fetch
-	git -C rpi-share/camotics reset --hard FETCH_HEAD
-	git -C rpi-share/camotics checkout ec876c80d20fc19837133087cef0c447df5a939d
 	cp ./scripts/gplan-build.sh rpi-share/
 	chmod +x rpi-share/gplan-build.sh
 	sudo ./scripts/rpi-chroot.sh $(GPLAN_IMG) /mnt/host/gplan-build.sh
@@ -105,4 +99,8 @@ $(TARGET_DIR)/%.html: src/pug/%.pug node_modules FORCE
 	@mkdir -p $(TARGET_DIR)
 	$(PUG) -O pug-opts.js -P $< -o $(TARGET_DIR) || (rm -f $@; exit 1)
 
+clean:
+	rm -rf rpi-share
+	git clean -fxd
+
 .PHONY: all install clean tidy pkg gplan lint pylint jshint bbserial
diff --git a/scripts/gplan-init-build.sh b/scripts/gplan-init-build.sh
index 6ac69df..b154758 100755
--- a/scripts/gplan-init-build.sh
+++ b/scripts/gplan-init-build.sh
@@ -31,30 +31,20 @@ if [ ! -e $GPLAN_IMG ]; then
     mv $GPLAN_IMG.tmp $GPLAN_IMG
 fi
 
-# Get repos
-function fetch_local_repo() {
-    mkdir -p $1
-    git -C $1 init
-    git -C $1 fetch -t "$2" $3
-    git -C $1 reset --hard FETCH_HEAD
-}
-
 mkdir -p rpi-share || true
 
 if [ ! -e rpi-share/cbang ]; then
-    if [ "$CBANG_HOME" != "" ]; then
-        fetch_local_repo rpi-share/cbang "$CBANG_HOME" master
-    else
-        git clone https://github.com/CauldronDevelopmentLLC/cbang \
-            rpi-share/cbang
-    fi
+    mkdir -p rpi-share/cbang
+    git -C rpi-share/cbang init
+    git -C rpi-share/cbang remote add origin https://github.com/CauldronDevelopmentLLC/cbang
+	git -C rpi-share/cbang fetch --depth 1 origin 18f1e963107ef26abe750c023355a5c40dd07853
+    git -C rpi-share/cbang reset --hard FETCH_HEAD
 fi
 
 if [ ! -e rpi-share/camotics ]; then
-    if [ "$CAMOTICS_HOME" != "" ]; then
-        fetch_local_repo rpi-share/camotics "$CAMOTICS_HOME" master
-    else
-        git clone https://github.com/CauldronDevelopmentLLC/camotics \
-            rpi-share/camotics
-    fi
+    mkdir -p rpi-share/camotics
+    git -C rpi-share/camotics init
+    git -C rpi-share/camotics remote add origin https://github.com/CauldronDevelopmentLLC/camotics
+	git -C rpi-share/camotics fetch --depth 1 origin ec876c80d20fc19837133087cef0c447df5a939d
+    git -C rpi-share/camotics reset --hard FETCH_HEAD
 fi