diff --git a/install.sh b/install.sh index ff60e94..797e683 100755 --- a/install.sh +++ b/install.sh @@ -35,17 +35,12 @@ check_utils(){ fi } -if [ test -f $INSTALL_PATH_FILE ]; then - TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE) -else - echo -n -e "\e[0mToolchain install path \e[90m(default is $DEFAULT_TOOLCHAIN_DIR)\e[97m: " - read INPUT +TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE) +echo -n -e "\e[0mToolchain install path \e[90m(default is $TOOLCHAIN_DIR)\e[97m: " +read INPUT - if [[ ! -z "$INPUT" ]]; then - TOOLCHAIN_DIR=$INPUe - else - TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR - fi +if [[ ! -z "$INPUT" ]]; then + TOOLCHAIN_DIR=$INPUT fi print_msg "Checking utilities..." diff --git a/package/DEBIAN/postinst b/package/DEBIAN/postinst index 9f875f4..1d12e54 100755 --- a/package/DEBIAN/postinst +++ b/package/DEBIAN/postinst @@ -35,17 +35,12 @@ check_utils(){ fi } -if [ test -f $INSTALL_PATH_FILE ]; then - TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE) -else - echo -n -e "\e[0mToolchain install path \e[90m(default is $DEFAULT_TOOLCHAIN_DIR)\e[97m: " - read INPUT +TOOLCHAIN_DIR=$(head -n 1 $INSTALL_PATH_FILE) +echo -n -e "\e[0mToolchain install path \e[90m(default is $TOOLCHAIN_DIR)\e[97m: " +read INPUT - if [[ ! -z "$INPUT" ]]; then - TOOLCHAIN_DIR=$INPUe - else - TOOLCHAIN_DIR=$DEFAULT_TOOLCHAIN_DIR - fi +if [[ ! -z "$INPUT" ]]; then + TOOLCHAIN_DIR=$INPUT fi echo -e "\e[0mInstalling toolchain to \e[97m$TOOLCHAIN_DIR\e[0m" @@ -117,8 +112,6 @@ EXPORT_MESSSAGE="export $MESSAGE" if [ ! "$(id -u)" -ne 0 ] then echo $MESSAGE >> /etc/profile - - sudo mkdir -p $CONFIG_FOLDER echo $TOOLCHAIN_DIR > $INSTALL_PATH_FILE else if ! grep -q $EXPORT_MESSSAGE ~/.bashrc; then diff --git a/package/etc/kos32-gcc/install-path b/package/etc/kos32-gcc/install-path new file mode 100644 index 0000000..d35b78f --- /dev/null +++ b/package/etc/kos32-gcc/install-path @@ -0,0 +1 @@ +/home/autobuild/tools