From c294c8d9df730feb57c7d08bebe8079af783e72d Mon Sep 17 00:00:00 2001
From: glasseyes <dglassey@gmail.com>
Date: Thu, 6 Sep 2018 10:43:40 +0700
Subject: [PATCH] move scripts to scripts dir

add VS code workspace for linux dir
that also includes onboard-keyman dir
fix cow.sh creation of hook scripts
---
 linux/Makefile                | 22 +++++++++++-----------
 linux/linux.code-workspace    | 10 ++++++++++
 linux/{ => scripts}/build.sh  |  0
 linux/{ => scripts}/cow.sh    | 14 ++++++++------
 linux/{ => scripts}/deb.sh    |  0
 linux/{ => scripts}/dist.sh   |  0
 linux/{ => scripts}/reconf.sh |  0
 7 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 linux/linux.code-workspace
 rename linux/{ => scripts}/build.sh (100%)
 rename linux/{ => scripts}/cow.sh (65%)
 rename linux/{ => scripts}/deb.sh (100%)
 rename linux/{ => scripts}/dist.sh (100%)
 rename linux/{ => scripts}/reconf.sh (100%)

diff --git a/linux/Makefile b/linux/Makefile
index b3295508c1..bba702c448 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,37 +1,37 @@
 #!/usr/bin/make
 
 tmpbuild: devreconf
-	./build.sh
+	./scripts/build.sh
 
 install_local: devreconf
-	SUDOINSTALL="yes" ./build.sh
+	SUDOINSTALL="yes" ./scripts/build.sh
 
 uninstall_local: devreconf
-	SUDOINSTALL="uninstall" ./build.sh
+	SUDOINSTALL="uninstall" ./scripts/build.sh
 
 debnocow:
-	./deb.sh
+	./scripts/deb.sh
 
 reconf:
-	./reconf.sh
+	./scripts/reconf.sh
 
 dist:
-	./dist.sh
+	./scripts/dist.sh
 
 origdist:
-	./dist.sh origdist
+	./scripts/dist.sh origdist
 
 sourcepackage: reconf origdist
-	./deb.sh sourcepackage
+	./scripts/deb.sh sourcepackage
 
 devsourcepackage: devreconf origdist
-	./deb.sh sourcepackage
+	./scripts/deb.sh sourcepackage
 
 devreconf:
-	./reconf.sh dev
+	./scripts/reconf.sh dev
 
 cow:
-	./cow.sh
+	./scripts/cow.sh
 
 deb: devreconf origdist cow debnocow
 	echo "Built dev Debian packages in builddebs/"
diff --git a/linux/linux.code-workspace b/linux/linux.code-workspace
new file mode 100644
index 0000000000..8a5761daf7
--- /dev/null
+++ b/linux/linux.code-workspace
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../onboard-keyman"
+		},
+	],
+}
diff --git a/linux/build.sh b/linux/scripts/build.sh
similarity index 100%
rename from linux/build.sh
rename to linux/scripts/build.sh
diff --git a/linux/cow.sh b/linux/scripts/cow.sh
similarity index 65%
rename from linux/cow.sh
rename to linux/scripts/cow.sh
index ee99958369..de15857ed0 100755
--- a/linux/cow.sh
+++ b/linux/scripts/cow.sh
@@ -7,7 +7,6 @@ set -e
 
 distributions='bionic xenial'
 
-
 dpkgcheck=`dpkg-query -l cowbuilder`
 if [ $? != 0 ]; then
 
@@ -26,12 +25,15 @@ for dist in $distributions; do
     fi
     sudo mkdir -p /var/cache/pbuilder/hook.d/${dist}
     if [ ! -e /var/cache/pbuilder/hook.d/${dist}/D70results ]; then
-        sudo echo "#!/bin/bash" > /var/cache/pbuilder/hook.d/${dist}/D70results
-        sudo echo "cd /var/cache/pbuilder/result/bionic" >> /var/cache/pbuilder/hook.d/${dist}/D70results
-        sudo echo "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/bionic/Packages" >> /var/cache/pbuilder/hook.d/${dist}/D70results
-        sudo echo "/usr/bin/apt-get update" >> /var/cache/pbuilder/hook.d/${dist}/D70results
+        echo "#!/bin/bash" | sudo tee /var/cache/pbuilder/hook.d/${dist}/D70results
+        echo "cd /var/cache/pbuilder/result/${dist}" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
+        echo "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/${dist}/Packages" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
+        echo "/usr/bin/apt-get update" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
         sudo ln -s /var/cache/pbuilder/hook.d/${dist}/D70results /var/cache/pbuilder/hook.d/${dist}/B70buildresults
     fi
+    if [ ! -e /var/cache/pbuilder/hook.d/${dist}/D80no-man-db-rebuild ]; then
+        sudo ln -s /usr/share/doc/pbuilder/examples/D80no-man-db-rebuild /var/cache/pbuilder/hook.d/${dist}/D80no-man-db-rebuild
+    fi
     sudo mkdir -p /var/cache/pbuilder/result/${dist}
     sudo cowbuilder update --distribution ${dist} --basepath /var/cache/pbuilder/base-${dist}.cow --override-config --othermirror="deb [trusted=yes] file:/var/cache/pbuilder/result/${dist} ./" --bindmounts /var/cache/pbuilder/result/${dist} --hookdir /var/cache/pbuilder/hook.d/${dist}
-done
\ No newline at end of file
+done
diff --git a/linux/deb.sh b/linux/scripts/deb.sh
similarity index 100%
rename from linux/deb.sh
rename to linux/scripts/deb.sh
diff --git a/linux/dist.sh b/linux/scripts/dist.sh
similarity index 100%
rename from linux/dist.sh
rename to linux/scripts/dist.sh
diff --git a/linux/reconf.sh b/linux/scripts/reconf.sh
similarity index 100%
rename from linux/reconf.sh
rename to linux/scripts/reconf.sh