From fa772cde39dfeed0b8cd9580f6f33faea05fa05c Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 18 Mar 2021 01:19:05 +0100
Subject: [PATCH] Fix minification if tweego exists in $PATH
---
compile.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/compile.sh b/compile.sh
index 48aa0183ed1..bede064779d 100755
--- a/compile.sh
+++ b/compile.sh
@@ -43,13 +43,10 @@ function compile() {
echoMessage "x64 arch"
if [ "$(uname -s)" = "Darwin" ]; then
TWEEGO_EXE="./devTools/tweeGo/tweego_osx64"
- MINIFY_EXE="./devTools/minify/minify_darwin_amd64"
elif [ "$OSTYPE" = "msys" ]; then
TWEEGO_EXE="./devTools/tweeGo/tweego_win64"
- MINIFY_EXE="./devTools/minify/minify_win_amd64"
else
TWEEGO_EXE="./devTools/tweeGo/tweego_nix64"
- MINIFY_EXE="./devTools/minify/minify_linux_amd64"
fi
;;
x86 | i[3-6]86)
@@ -70,6 +67,16 @@ function compile() {
esac
fi
+ if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "amd64" ]; then
+ if [ "$(uname -s)" = "Darwin" ]; then
+ MINIFY_EXE="./devTools/minify/minify_darwin_amd64"
+ elif [ "$OSTYPE" = "msys" ]; then
+ MINIFY_EXE="./devTools/minify/minify_win_amd64.exe"
+ else
+ MINIFY_EXE="./devTools/minify/minify_linux_amd64"
+ fi
+ fi
+
file="bin/FC_pregmod.html"
# Find and insert current commit
--
GitLab