From 9979418c9c6b53082c6acd0d6ebec9ab5f6e42c4 Mon Sep 17 00:00:00 2001
From: octospacc <octo@tutamail.com>
Date: Thu, 23 Feb 2023 08:53:00 +0100
Subject: [PATCH] Fix scripts

---
 .github/workflows/main.yml       |  2 +-
 .gitlab-ci.yml                   |  4 ++--
 Scripts/Deploy.Tor.sh            |  2 +-
 Scripts/Get.staticosoDevFixed.sh | 11 +++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 Scripts/Get.staticosoDevFixed.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 848e1fa..7687246 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.10
         sudo pip3 install lxml
         sudo npm install -g pug-cli
-        git clone --depth 1 https://gitlab.com/octtspacc/staticoso
+        sh ./Scripts/Get.staticosoDevFixed.sh
         sh ./Scripts/Deploy.GitHub.sh
         sh ./Scripts/Prepare.NoStyle.sh
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8912f5..3c0fb79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: alpine:latest
 
 before_script: |
   apk update
-  apk add python3 py3-pip npm go git
+  apk add python3 py3-pip npm go git tar wget
   pip3 install requests lxml
   npm install -g pug-cli
 
@@ -17,7 +17,7 @@ pages:
     chmod +x ./html2gmi
     PATH=$PATH:$PWD
     cd ..
-    git clone --depth 1 https://gitlab.com/octtspacc/staticoso
+    sh ./Scripts/Get.staticosoDevFixed.sh
     sh ./Scripts/Deploy.GitLab.sh
     sh ./Scripts/Deploy.Gemini.sh
     sh ./Scripts/Prepare.NoStyle.sh
diff --git a/Scripts/Deploy.Tor.sh b/Scripts/Deploy.Tor.sh
index 8f2909a..da7d655 100755
--- a/Scripts/Deploy.Tor.sh
+++ b/Scripts/Deploy.Tor.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-python3 ../staticoso/App/Source/Build.py \
+python3 ../staticoso/Source/Build.py \
 	--SiteDomain="http://sitoctt2fxjvx3lc2iqqef2aeulflprjaasv2xl4zi7sxxbmvjy5b5yd.onion" \
 	--FolderRoots="{'*':'/', 'Assets':'/sitoctt-assets'}" \
 	--NoScripts=True
diff --git a/Scripts/Get.staticosoDevFixed.sh b/Scripts/Get.staticosoDevFixed.sh
new file mode 100644
index 0000000..6b2dde4
--- /dev/null
+++ b/Scripts/Get.staticosoDevFixed.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+staticosoCommit="c35aa94345ce16c9109fd5a9f35c5aa9498fb664"
+
+#git clone --depth 1 https://gitlab.com/octtspacc/staticoso
+
+wget \
+	-O ./staticoso.tar.bz2 \
+	https://gitlab.com/octtspacc/staticoso/-/archive/$staticosoCommit/staticoso-$staticosoCommit.tar.bz2
+tar xvf ./staticoso.tar.bz2
+mv ./staticoso-$staticosoCommit ./staticoso