Add lnav; fix build script

Added lnav for viewing logs on the server side.
Fixed build script to place output files into _output/client and _output/server
directories for deploy

diff --git a/build.sh b/build.sh
index b5510e2dc34c2c43cf49f2591504643221000cc3..7af004ec1774bc4a57dc425eb9c7dd5f65e594d6 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -5,25 +5,29 @@ set -eou pipefail
 
 if command -v apt; then
   sudo apt update || true
-  sudo apt install -y clang || true
-  sudo apt install -y gcc || true
-  sudo apt install -y g++ || true
-  sudo apt install -y make || true
   sudo apt install -y autoconf || true
-  sudo apt install -y libtool || true
+  sudo apt install -y clang || true
   sudo apt install -y curl || true
+  sudo apt install -y g++ || true
+  sudo apt install -y gcc || true
   sudo apt install -y git || true
+  sudo apt install -y libtool || true
+  sudo apt install -y make || true
+  sudo apt install -y wget || true
   sudo apt install -y zip || true
 fi
 
-mkdir -p build/output
+mkdir -p build/_output
+mkdir build/_output/server
+mkdir build/_output/client
 cd build/
 
-wget https://busybox.net/downloads/busybox-1.36.1.tar.bz2
-wget https://github.com/DominicBreuker/pspy/releases/download/v1.2.1/pspy64
-wget https://github.com/inotify-tools/inotify-tools/archive/refs/tags/4.23.9.0.tar.gz
-mv 4.23.9.0.tar.gz inotify-tools-4.23.9.0.tar.gz
-wget http://staticperl.schmorp.de/smallperl.bin
+#wget https://busybox.net/downloads/busybox-1.36.1.tar.bz2
+#wget https://github.com/DominicBreuker/pspy/releases/download/v1.2.1/pspy64
+#wget https://github.com/inotify-tools/inotify-tools/archive/refs/tags/4.23.9.0.tar.gz
+#mv 4.23.9.0.tar.gz inotify-tools-4.23.9.0.tar.gz
+#wget https://github.com/tstack/lnav/releases/download/v0.11.2/lnav-0.11.2-x86_64-linux-musl.zip
+#wget http://staticperl.schmorp.de/smallperl.bin
 
 sha256sum -c ../checksums
 
@@ -51,10 +55,18 @@ make
 unset CFLAGS
 unset CXXFLAGS
 unset LDFLAGS
+cd ..
+
+unzip lnav-0.11.2-x86_64-linux-musl.zip
 
+cp busybox-1.36.1/busybox _output/server/
+cp busybox-1.36.1/busybox _output/client/
+cp inotify-tools-4.23.9.0/src/inotifywait _output/client/
+cp pspy64 _output/client/
+cp smallperl.bin _output/client/
+cp lnav-0.11.2/lnav _output/server/
+chmod u+x _output/server/*
+chmod u+x _output/client/*
 
-cd build
-cp busybox-1.36.1/busybox output/
-cp inotify-tools-4.23.9.0/src/inotifywait output/
-cp pspy64 output/
-cp smallperl.bin output/
+cp ../src/*server* _output/server/
+cp ../src/*client* _output/client/

diff --git a/checksums b/checksums
index 52405046571ef27a06fb522a08aef5153565b4ec..bf11fc8adeaf587e59b28ec6f0607daf5934aea1 100644 (file)
--- a/checksums
+++ b/checksums
@@ -1,3 +1,5 @@
 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314  busybox-1.36.1.tar.bz2
+1dfa33f80b6797ce2f6c01f454fd486d30be4dca1b0c5c2ea9ba3c30a5c39855  inotify-tools-4.23.9.0.tar.gz
+6515598ca4985ec42daeafbae7eb5c7c6d7e94a11f88666d157b3d363aa391ff  lnav-0.11.2-x86_64-linux-musl.zip
 f2376087e79ba18f2e1625e1ae969e6e96ef6fa2b77acd715041662658685c13  smallperl.bin
 c93f29a5cc1347bdb90e14a12424e6469c8cfea9a20b800bc249755f0043a3bb  pspy64