From 0374af72f6737d21ea5e9169e9cac31b3c366738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80?= <148970641+Egor00f@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:46:18 +0500 Subject: [PATCH] Update install.sh + Use tabs instad spaces + Updating all libraries --- install.sh | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/install.sh b/install.sh index 6dc1674..36f2328 100755 --- a/install.sh +++ b/install.sh @@ -2,30 +2,31 @@ # Written by turbocat2001 (Maxim Logaev) # Installation steps described by maxcodehack (Maxim Kuzmitsky) +# modified by Egor00f (Egor) set -e print_msg(){ - echo -e "\e[34m$1\e[0m" + echo -e "\e[34m$1\e[0m" } print_ok(){ - echo -e "\e[32m$1\e[0m" + echo -e "\e[32m$1\e[0m" } print_err(){ - echo -e "\e[31m$1\e[0m" - exit + echo -e "\e[31m$1\e[0m" + exit } check_utils(){ - printf "%s: " $1 - if command -v $1 &> /dev/null - then - print_ok "ok\r" - else - print_err "no\r" - fi + printf "%s: " $1 + if command -v $1 &> /dev/null + then + print_ok "ok\r" + else + print_err "no\r" + fi } pwd @@ -40,7 +41,7 @@ echo -n $MESSAGE read INPUT if [[ ! -z "$INPUT" ]]; then - TOOLCHAIN_DIR=$INPUT + TOOLCHAIN_DIR=$INPUT fi echo "Installing toolchain to $TOOLCHAIN_DIR" @@ -96,15 +97,7 @@ print_ok "Successfully!" print_msg "Updating libraries" cd lib -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -q -O libdll.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -q -O libfreetype.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -q -O libc.dll.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -q -O libSDLn.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -q -O libcurses.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -q -O libz.dll.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -q -O libogg.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -q -O libvorbis.a -sudo wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -q -O libopenjpeg.a +sudo wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib print_ok "Successfully!" @@ -117,7 +110,7 @@ sudo wget http://board.kolibrios.org/download/file.php?id=8301libisl.so.10.2.2.7 sudo 7z x -y libisl.so.10.2.2.7z if ! [ -d /usr/lib/x86_64-linux-gnu/ ]; then - sudo mkdir -p /usr/lib/x86_64-linux-gnu/ + sudo mkdir -p /usr/lib/x86_64-linux-gnu/ fi sudo mv /tmp/libisl.so.10.2.2 /usr/lib/x86_64-linux-gnu/libisl.so.10.2.2 @@ -138,7 +131,7 @@ print_ok "Successfully!" if [ "$TOOLCHAIN_DIR" != "$DEFAULT_TOOLCHAIN_DIR" ]; then - sudo ln -sf $TOOLCHAIN_DIR/win32 $DEFAULT_TOOLCHAIN_DIR + sudo ln -sf $TOOLCHAIN_DIR/win32 $DEFAULT_TOOLCHAIN_DIR fi @@ -150,19 +143,20 @@ if [ ! "$(id -u)" -ne 0 ] then echo $MESSAGE >> /etc/profile - sudo mkdir -p /etc/kos32-gcc - echo $TOOLCHAIN_DIR > /etc/kos32-gcc/install-path + sudo mkdir -p /etc/kos32-gcc + echo $TOOLCHAIN_DIR > /etc/kos32-gcc/install-path else - if ! grep -q $EXPORT_MESSSAGE ~/.bashrc; then - print_msg "Adding '$TOOLCHAIN_DIR/win32/bin' to '~/.bashrc'" - echo '$EXPORT_MESSSAGE' >> ~/.bashrc - fi + if ! grep -q $EXPORT_MESSSAGE ~/.bashrc; then + print_msg "Adding '$TOOLCHAIN_DIR/win32/bin' to '~/.bashrc'" + echo '$EXPORT_MESSSAGE' >> ~/.bashrc + fi fi sudo chmod 775 $TOOLCHAIN_DIR/win32/bin/* sudo chmod 775 $TOOLCHAIN_DIR/win32/include/* sudo chmod -R 775 $TOOLCHAIN_DIR/win32/lib/gcc/mingw32/5.4.0/include + cd "$OLDPWD" export PATH=$PATH:$TOOLCHAIN_DIR/win32/bin