diff --git a/README.md b/README.md index 8077e4e..979ad66 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ -------------- -## How to install prebuilt packages (OpenWrt 21 & 22 & master) +## How to install prebuilt packages (OpenWrt 19 & 21 & 22 & master) - Login OpenWrt terminal (SSH) diff --git a/install.sh b/install.sh index d92e5cb..1aa2bd4 100755 --- a/install.sh +++ b/install.sh @@ -10,7 +10,7 @@ platform=$(opkg print-architecture | awk 'END{print $2}') # TMP TMPDIR=$(mktemp -d) || exit 1 -# MYIP +# GitHub mirror ip_info=$(curl -s https://ip.cooluc.com) country_code=$(echo $ip_info | sed -r 's/.*country_code":"([^"]*).*/\1/') if [ $country_code = "CN" ]; then @@ -25,20 +25,22 @@ CHECK() ( echo -e "\r\n${GREEN_COLOR}Checking available space ...${RES}" ROOT_SPACE=$(df -m /usr | awk 'END{print $4}') if [ $ROOT_SPACE -lt 40 ]; then - echo -e "${RED_COLOR}Error, The system storage space is less than 40MB.${RES}" + echo -e "\r\n${RED_COLOR}Error, The system storage space is less than 40MB.${RES}" exit 1; fi echo -e "\r\n${GREEN_COLOR}Checking platform ...${RES}\r\n" prebuilt="aarch64_cortex-a53 aarch64_cortex-a72 aarch64_generic arm_arm1176jzf-s_vfp arm_arm926ej-s arm_cortex-a15_neon-vfpv4 arm_cortex-a5_vfpv4 arm_cortex-a7 arm_cortex-a7_neon-vfpv4 arm_cortex-a8_vfpv3 arm_cortex-a9 arm_cortex-a9_neon arm_cortex-a9_vfpv3-d16 arm_fa526 arm_mpcore arm_xscale i386_pentium-mmx i386_pentium4 mips64_octeonplus mips_24kc mips_4kec mips_mips32 mipsel_24kc mipsel_24kc_24kf mipsel_74kc mipsel_mips32 x86_64" - if [[ "$version" != "21" ]] && [[ "$version" != "22" ]]; then + verif=$(expr match "$prebuilt" ".*\($platform\)") + if [ "$version" != 19 -a "$version" != 21 -a "$version" != 22 ]; then echo -e "${RED_COLOR}Error! OpenWrt \"$(cat /etc/os-release | grep VERSION_ID | awk -F "[\"\"]" '{print $2}')\" version is not supported.${RES}" exit 1; - elif [[ ! "$prebuilt" =~ "$platform" ]]; then + elif [[ ! $verif ]]; then echo -e "${RED_COLOR}Error! The current \"$platform\" platform is not currently supported.${RES}" exit 1; else echo -e "${GREEN_COLOR}Update opkg sources ...${RES}" opkg update + opkg install luci-compat fi )