From 37bb4e7a607715dee1d0ca51009edafc2a3b23d7 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 18 Apr 2019 18:08:04 -0400
Subject: [PATCH] move bitmap-fonts and ibmfonts submodules to first level so
 they copy properly

---
 .gitmodules                  | 8 ++++----
 bitmap-fonts                 | 1 +
 ibmfonts                     | 1 +
 scripts/sync-version-prod.sh | 2 ++
 tools/fonts/bitmap-fonts     | 2 +-
 tools/fonts/ibmfonts         | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)
 create mode 160000 bitmap-fonts
 create mode 160000 ibmfonts
 mode change 160000 => 120000 tools/fonts/bitmap-fonts
 mode change 160000 => 120000 tools/fonts/ibmfonts

diff --git a/.gitmodules b/.gitmodules
index df41f968..5f8057b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,11 +19,11 @@
 [submodule "localForage"]
 	path = localForage
 	url = https://github.com/localForage/localForage
-[submodule "tools/fonts/bitmap-fonts"]
-	path = tools/fonts/bitmap-fonts
+[submodule "bitmap-fonts"]
+	path = bitmap-fonts
 	url = https://github.com/Tecate/bitmap-fonts
-[submodule "tools/fonts/ibmfonts"]
-	path = tools/fonts/ibmfonts
+[submodule "ibmfonts"]
+	path = ibmfonts
 	url = https://github.com/farsil/ibmfonts
 [submodule "jsnes"]
 	path = jsnes
diff --git a/bitmap-fonts b/bitmap-fonts
new file mode 160000
index 00000000..6f52a7ca
--- /dev/null
+++ b/bitmap-fonts
@@ -0,0 +1 @@
+Subproject commit 6f52a7ca0838967cc57e9a44d76c6e1f60e62842
diff --git a/ibmfonts b/ibmfonts
new file mode 160000
index 00000000..7a9227d4
--- /dev/null
+++ b/ibmfonts
@@ -0,0 +1 @@
+Subproject commit 7a9227d43057b6ab6271a2577ecce47fa3360134
diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh
index 1abf289a..fe2d74ab 100755
--- a/scripts/sync-version-prod.sh
+++ b/scripts/sync-version-prod.sh
@@ -19,6 +19,8 @@ echo "Extracting to $TMPDIR..."
 rm -fr $TMPDIR
 mkdir -p $TMPDIR
 git archive $VERSION | tar x -C $TMPDIR
+ls $TMPDIR
+pause
 echo "Copying to $DESTPATH..."
 rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz --chmod=a+rx -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
 rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" --copy-dest=$DEVPATH ./gen  $DESTPATH/
diff --git a/tools/fonts/bitmap-fonts b/tools/fonts/bitmap-fonts
deleted file mode 160000
index 6f52a7ca..00000000
--- a/tools/fonts/bitmap-fonts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f52a7ca0838967cc57e9a44d76c6e1f60e62842
diff --git a/tools/fonts/bitmap-fonts b/tools/fonts/bitmap-fonts
new file mode 120000
index 00000000..c293b1b2
--- /dev/null
+++ b/tools/fonts/bitmap-fonts
@@ -0,0 +1 @@
+../../bitmap-fonts
\ No newline at end of file
diff --git a/tools/fonts/ibmfonts b/tools/fonts/ibmfonts
deleted file mode 160000
index 7a9227d4..00000000
--- a/tools/fonts/ibmfonts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a9227d43057b6ab6271a2577ecce47fa3360134
diff --git a/tools/fonts/ibmfonts b/tools/fonts/ibmfonts
new file mode 120000
index 00000000..8689af2c
--- /dev/null
+++ b/tools/fonts/ibmfonts
@@ -0,0 +1 @@
+../../ibmfonts
\ No newline at end of file