Change from pnpm to npm, add link.sh shortcuts for npm style package linking

diff --git a/build_cache b/build_cache
index dbe7a95..97c1f72 160000 (submodule)
--- a/build_cache
+++ b/build_cache
@@ -1 +1 @@
-Subproject commit dbe7a95b6115eda7e89ef949d8710e8a448c6a37
+Subproject commit 97c1f72845c6bd894572b87865b5082c325840b7

diff --git a/clean-css b/clean-css
index 16376eb..056812e 160000 (submodule)
--- a/clean-css
+++ b/clean-css
@@ -1 +1 @@
-Subproject commit 16376eb43ca83f3456594f6f41837de5f778448d
+Subproject commit 056812e3e64e65d337023f924e1554a16bb6d213

diff --git a/disk_build b/disk_build
index b1e2b6a..93cf74b 160000 (submodule)
--- a/disk_build
+++ b/disk_build
@@ -1 +1 @@
-Subproject commit b1e2b6a41c5904dca0e6febf789c8f8dafb56783
+Subproject commit 93cf74bc9455015d72091bad3fc19a160dcdc392

diff --git a/emailjs_cache b/emailjs_cache
index 944a2b0..8a0144f 160000 (submodule)
--- a/emailjs_cache
+++ b/emailjs_cache
@@ -1 +1 @@
-Subproject commit 944a2b0d9191f56059dda0169640082749767774
+Subproject commit 8a0144f0fd1e14a8ce2e62adf284c2b13bc87a0a

diff --git a/html-minifier b/html-minifier
index 8c49e75..b262e1b 160000 (submodule)
--- a/html-minifier
+++ b/html-minifier
@@ -1 +1 @@
-Subproject commit 8c49e75597fb7738f616dca66742ab109385a9ce
+Subproject commit b262e1bec64ecaa134a9f8384b8fc9837307aac8

diff --git a/install.sh b/install.sh
index 3ea477b..85ed95b 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -14,49 +14,34 @@ PATH=/opt/$NODE/bin:$PATH
 
 sudo rm -rf ~/.npm
 echo "prefix=$HOME" >~/.npmrc
-sudo `which node` `which npm` install --global pnpm@6.24.4
-
-rm -rf ~/.pnpm-store
+rm -rf $HOME/lib/node_modules
+rm -f $HOME/bin/jstize $HOME/bin/jst_server
 
 for i in \
-"build_cache" \
-"clean-css" \
-"disk_build" \
-"emailjs_cache build_cache" \
-"html-minifier clean-css" \
-"json_cache build_cache" \
-"json_cache_rw" \
-"jst build_cache clean-css disk_build" \
-"jst_cache build_cache disk_build jst" \
-"jstize clean-css html-minifier" \
-"less_css_cache build_cache disk_build" \
-"menu_cache build_cache disk_build" \
-"min_css_cache build_cache clean-css disk_build" \
-"min_html_cache build_cache disk_build html-minifier" \
-"min_js_cache build_cache disk_build" \
-"min_svg_cache build_cache disk_build" \
-"node_zettair" \
-"text_cache build_cache" \
-"zettair_cache build_cache node_zettair" \
-"ndcode_site emailjs_cache zettair_cache" \
-"zip_cache build_cache" \
-"jst_server json_cache json_cache_rw jst_cache less_css_cache menu_cache min_css_cache min_html_cache min_js_cache min_svg_cache text_cache zip_cache"
+build_cache \
+clean-css \
+disk_build \
+emailjs_cache \
+html-minifier \
+json_cache \
+json_cache_rw \
+jst \
+jst_cache \
+jstize \
+less_css_cache \
+menu_cache \
+min_css_cache \
+min_html_cache \
+min_js_cache \
+min_svg_cache \
+node_zettair \
+text_cache \
+zettair_cache \
+ndcode_site \
+zip_cache \
+jst_server
 do
-  set $i
-  module=$1
-  echo "installing $module"
-  shift
-  (
-    cd $module
-    rm -rf node_modules
-    for j in $@
-    do
-      echo "linking $module to $j"
-      pnpm link ../$j
-    done
-    echo "installing other dependencies of $module"
-    pnpm install
-  )
+  (cd $i && ./link.sh)
 done
 
 sudo apt install python3-pip

diff --git a/json_cache b/json_cache
index 8724dde..099d970 160000 (submodule)
--- a/json_cache
+++ b/json_cache
@@ -1 +1 @@
-Subproject commit 8724dde12ce0790dd56e147bb41efbf6fa67178c
+Subproject commit 099d970f8a7944a7f79c4912286681c660449b13

diff --git a/json_cache_rw b/json_cache_rw
index 3707473..303bd74 160000 (submodule)
--- a/json_cache_rw
+++ b/json_cache_rw
@@ -1 +1 @@
-Subproject commit 37074730acc7b5c1add0022b2edbba3275a9f7d9
+Subproject commit 303bd74023a128714544c94fe30227262f081155

diff --git a/jst b/jst
index cdb464e..c033c0d 160000 (submodule)
--- a/jst
+++ b/jst
@@ -1 +1 @@
-Subproject commit cdb464e31efcbdb0c60b11045331e721db2ffa39
+Subproject commit c033c0df6a6daa117027fbbe3d775611f9eca541

diff --git a/jst_cache b/jst_cache
index 1405524..f8c4f31 160000 (submodule)
--- a/jst_cache
+++ b/jst_cache
@@ -1 +1 @@
-Subproject commit 140552441cc48fb1119c2aabd3db7471a6b54803
+Subproject commit f8c4f3165294f1a58f03755def8b419f643f2077

diff --git a/jst_server b/jst_server
index 4c83986..da2127e 160000 (submodule)
--- a/jst_server
+++ b/jst_server
@@ -1 +1 @@
-Subproject commit 4c83986aed89fa41e7d665393e67016bcd9defdc
+Subproject commit da2127ede578e0d5ff2273fea968a4c67f65f132

diff --git a/jstize b/jstize
index 5a33d55..4ea80cc 160000 (submodule)
--- a/jstize
+++ b/jstize
@@ -1 +1 @@
-Subproject commit 5a33d551de48cdb152f0731bcc30b6b7d1f6e3c2
+Subproject commit 4ea80ccee46f8ac8685a944b9174dc82c67a8816

diff --git a/less_css_cache b/less_css_cache
index afee7bd..158fba2 160000 (submodule)
--- a/less_css_cache
+++ b/less_css_cache
@@ -1 +1 @@
-Subproject commit afee7bdb595094dcba2daeca8bce1f4394ca9192
+Subproject commit 158fba2ece4e7672c791a751bc0a6c436dd1b349

diff --git a/menu_cache b/menu_cache
index ac34e6e..5cc5b0e 160000 (submodule)
--- a/menu_cache
+++ b/menu_cache
@@ -1 +1 @@
-Subproject commit ac34e6ebd9c3e6af6c83c174f977f114e8db0d6e
+Subproject commit 5cc5b0e9ce6f683e16bac582587e2409e1227491

diff --git a/min_css_cache b/min_css_cache
index f43f49d..628e8b6 160000 (submodule)
--- a/min_css_cache
+++ b/min_css_cache
@@ -1 +1 @@
-Subproject commit f43f49d3750650cf75d611940c3c5437681328c6
+Subproject commit 628e8b68706798b32b28cb71cb96dd397faf63e8

diff --git a/min_html_cache b/min_html_cache
index ee73c57..de35f37 160000 (submodule)
--- a/min_html_cache
+++ b/min_html_cache
@@ -1 +1 @@
-Subproject commit ee73c57006c1aecdf65fbbf65a362b6226e5775c
+Subproject commit de35f37cf310268eea73768ccc8ce9b95860f79d

diff --git a/min_js_cache b/min_js_cache
index b47e88f..85e45da 160000 (submodule)
--- a/min_js_cache
+++ b/min_js_cache
@@ -1 +1 @@
-Subproject commit b47e88f0f1790a31155620419d9f9c9bbbf09f17
+Subproject commit 85e45daf8d0b38cee5de00a7c62c1f4af4c8c965

diff --git a/min_svg_cache b/min_svg_cache
index 60202af..74d23eb 160000 (submodule)
--- a/min_svg_cache
+++ b/min_svg_cache
@@ -1 +1 @@
-Subproject commit 60202af340bd3877f95edfe34c50b35a3b99681b
+Subproject commit 74d23eb997c722a24685cc07ea78102f09df9329

diff --git a/ndcode_site b/ndcode_site
index cac64e4..9d0e61a 160000 (submodule)
--- a/ndcode_site
+++ b/ndcode_site
@@ -1 +1 @@
-Subproject commit cac64e4b02d51e150276528b72729e9dcb4d52ba
+Subproject commit 9d0e61ade10d41db7abdde0f32f649932bfb7748

diff --git a/node_zettair b/node_zettair
index e766792..75e54fe 160000 (submodule)
--- a/node_zettair
+++ b/node_zettair
@@ -1 +1 @@
-Subproject commit e766792c988c937051ff6531fda1f722b51702a4
+Subproject commit 75e54fe4f2062125d1ffa6a296b54a33b8508f00

diff --git a/text_cache b/text_cache
index b5242cf..9b45bc7 160000 (submodule)
--- a/text_cache
+++ b/text_cache
@@ -1 +1 @@
-Subproject commit b5242cf504f01120df29d978d63d940bbc854c7a
+Subproject commit 9b45bc7e2e30eb318da50a319dcc0aa40406db31

diff --git a/zettair_cache b/zettair_cache
index cc1e815..4a364ba 160000 (submodule)
--- a/zettair_cache
+++ b/zettair_cache
@@ -1 +1 @@
-Subproject commit cc1e81535833aff66105fb81f17a1914fb826206
+Subproject commit 4a364ba5d307624df9461a804d03f90302f746f4

diff --git a/zip_cache b/zip_cache
index 8453fbe..b0ef1ec 160000 (submodule)
--- a/zip_cache
+++ b/zip_cache
@@ -1 +1 @@
-Subproject commit 8453fbec95b4ded5e0a1ded6afa6a0fb334e7c23
+Subproject commit b0ef1ece32d21b829fa45f7b13454bf96f591d3c