From cb106b78e5ef3e621640cdcf2b105fea922c20e0 Mon Sep 17 00:00:00 2001
From: meliurwen <meliurwen@gmail.com>
Date: Thu, 8 Jul 2021 17:25:30 +0200
Subject: [PATCH] Stuff

---
 src/build.npm.sh              | 16 ++++++++++++++++
 src/build.sh                  | 19 +++++--------------
 src/install.npm.thirdparty.sh | 12 ++++++++++++
 src/main.sh                   | 14 ++++++++++++--
 4 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100755 src/build.npm.sh
 create mode 100755 src/install.npm.thirdparty.sh

diff --git a/src/build.npm.sh b/src/build.npm.sh
new file mode 100755
index 0000000..f766a20
--- /dev/null
+++ b/src/build.npm.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+apt-get update
+apt-get -qq -y --no-install-recommends install curl jq ca-certificates git g++ gcc make clang wget xz-utils python sudo
+mkdir build_node
+cd build_node/ || exit
+wget https://nodejs.org/dist/v12.14.1/node-v12.14.1.tar.xz
+tar xf node-v12.14.1.tar.xz
+mv node-v12.14.1 node
+cd node || exit
+./configure
+make -j4
+make install
+node --version
diff --git a/src/build.sh b/src/build.sh
index 4a7bf4e..d14e345 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -1,24 +1,15 @@
 #!/bin/sh
 
-#set -e
+set -e
 
 apt-get update
-apt-get -qq -y --no-install-recommends install curl jq ca-certificates git g++ gcc make clang wget xz-utils python sudo
-mkdir build_node
-cd build_node/ || exit
-wget https://nodejs.org/dist/v12.14.1/node-v12.14.1.tar.xz
-tar xf node-v12.14.1.tar.xz
-mv node-v12.14.1 node
-cd node || exit
-./configure
-make -j4
-make install
-node --version
-
 apt-get -y --no-install-recommends install git jq imagemagick curl build-essential pkg-config libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm
 
 npm install yarn --global
-cd .. || exit
+
 git clone https://github.com/VSCodium/vscodium.git
 cd vscodium/ || exit
+
+sed '/create_appimage\.sh/d' -i build.sh
+
 ./build/build_linux.sh
diff --git a/src/install.npm.thirdparty.sh b/src/install.npm.thirdparty.sh
new file mode 100755
index 0000000..6135ade
--- /dev/null
+++ b/src/install.npm.thirdparty.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+apt-get update
+apt-get -qq -y --no-install-recommends install curl wget ca-certificates sudo
+
+curl -fsSL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+
+apt-get -qq -y install nodejs
+
+node --version
diff --git a/src/main.sh b/src/main.sh
index 8779014..c9c028e 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -1,7 +1,17 @@
 #!/bin/sh
 
-#set -e
+set -e
 
+echo "Building node..."
+./build.npm.sh
+#./install.npm.thirdparty.sh
+
+echo "Building VSCodium..."
 ./build.sh
 
-./deploy.sh vscodium/.build/linux/deb/amd64/deb repo/incoming .ready
+echo "Package(s) deploy..."
+DIST_DIR="vscodium/.build/linux/deb/amd64/deb"
+INCOMING_DIR="repo/incoming"
+READY_SUFFIX=".ready"
+mkdir -p "${INCOMING_DIR}"
+./deploy.sh "${DIST_DIR}" "${INCOMING_DIR}" "${READY_SUFFIX}"