Minor changes to install procedure to run on ubuntu 16.04 and install node

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..e4fa73e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node-v11.15.0-linux-x64.tar.xz

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

diff --git a/install.sh b/install.sh
index ed0e7e9..cc6132f 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,8 +1,23 @@
 #!/bin/sh
 
-#apt install build-essential recode zlib1g-dev
+sudo apt install build-essential recode zlib1g-dev automake
 (cd zettair && ./configure --prefix=$HOME && make -j5 install)
 
+NODE_VERSION=v11.15.0
+NODE=node-$NODE_VERSION-linux-x64
+if ! test -f $NODE.tar.xz
+then
+  wget https://nodejs.org/download/release/$NODE_VERSION/$NODE.tar.xz
+fi
+unxz <$NODE.tar.xz |(cd /opt && sudo tar xvf -)
+PATH=/opt/$NODE/bin:$PATH
+
+sudo rm -rf ~/.npm
+echo "prefix=$HOME" >~/.npmrc
+sudo `which node` `which npm` install --global pnpm
+
+rm -rf ~/.pnpm-store
+
 for i in \
 "build_cache" \
 "clean-css" \
@@ -28,19 +43,23 @@ for i in \
 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
   )
 done
 
-#pip3 install --user numpy
+sudo apt install python3-pip
+pip3 install --user numpy
 
 for i in \
 pilex \
@@ -49,6 +68,7 @@ piyacc
 do
   (
     cd $i
+    (cd ndcode/$i && make)
     ./setup.py install --user
   )
 done

diff --git a/zettair b/zettair
index cfe9a7c..7953df4 160000 (submodule)
--- a/zettair
+++ b/zettair
@@ -1 +1 @@
-Subproject commit cfe9a7ca2618702a656c594b14bc0f95a29edfbc
+Subproject commit 7953df428a771dda903a7e0eadaa5afc645f5e39