diff --git a/install.bat b/install.bat index c5568e9..b4b2567 100644 --- a/install.bat +++ b/install.bat @@ -49,15 +49,9 @@ Call :print_msg Updating libraries cd %TOOLCHAIN_DIR%\win32\mingw32\lib -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libdll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libdll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libfreetype.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libfreetype.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libc.dll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libc.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libSDLn.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libSDLn.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libcurses.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libcurses.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libz.dll.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libz.dll.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libogg.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libogg.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libvorbis.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libvorbis.a -wget http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/libopenjpeg.a -O %TOOLCHAIN_DIR%\win32\mingw32\lib\libopenjpeg.a +wget -r --no-parent http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/ +move /-y builds.kolibrios.org\en_US\data\contrib\sdk\lib\* .\ +rd /s /q builds.kolibrios.org Call :print_ok Successfully! diff --git a/install.sh b/install.sh index fa87be4..1b056a9 100755 --- a/install.sh +++ b/install.sh @@ -5,6 +5,11 @@ # modified by Egor00f (Egor) set -e +pwd + +DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools" + +TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR print_msg(){ echo -e "\e[34m$1\e[0m" @@ -29,22 +34,14 @@ check_utils(){ fi } -pwd - -DEFAULT_TOOLCHAIN_DIR="/home/autobuild/tools" - -TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR - -MESSAGE="Toolchain install path(default is $TOOLCHAIN_DIR): " - -echo -n $MESSAGE +echo -n -e "\e[0m Toolchain install path \e[90m(default is $TOOLCHAIN_DIR): \e[97m" read INPUT if [[ ! -z "$INPUT" ]]; then TOOLCHAIN_DIR=$INPUT fi -echo "Installing toolchain to $TOOLCHAIN_DIR" +echo -e "\e[0mInstalling toolchain to \e[97m$TOOLCHAIN_DIR\e[0m" print_msg "Checking utilities..." @@ -97,7 +94,7 @@ print_ok "Successfully!" print_msg "Updating libraries" cd lib -sudo wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib +sudo wget -r --no-parent -q http://builds.kolibrios.org/en_US/data/contrib/sdk/lib/ sudo mv builds.kolibrios.org/en_US/data/contrib/sdk/lib/* ./ sudo rm -R builds.kolibrios.org diff --git a/package/DEBIAN/control b/package/DEBIAN/control index cfd9eef..9cd3714 100755 --- a/package/DEBIAN/control +++ b/package/DEBIAN/control @@ -1,6 +1,6 @@ Package: kos32-gcc -Version: 0.1.6 -Architecture: all +Version: 0.1.7 +Architecture: amd64 Section: devel Depends: libc6-i386:amd64, libmpc3:amd64 Pre-Depends: p7zip-full, wget diff --git a/package/DEBIAN/postrm b/package/DEBIAN/postrm index 20eddeb..f4be720 100755 --- a/package/DEBIAN/postrm +++ b/package/DEBIAN/postrm @@ -2,11 +2,11 @@ TOOLCHAIN_DIR=$(head -n 1 /etc/kos32-gcc/install-path) + + MESSAGE="PATH=\$PATH:$TOOLCHAIN_DIR/win32/bin" -if grep -q '$MESSAGE' /etc/profile; then - sudo sed -i '/$MESSAGE/d' /etc/profile -fi +sudo sed -i '/$MESSAGE/d' /etc/profile rm /etc/kos32-gcc -R