entware: pointed setup script to new installer urls; synced entware-setup.sh with NG branch

1 files changed, 36 insertions, 3 deletions

diff --git a/release/src/router/others/entware-setup.sh b/release/src/router/others/entware-setup.sh
index c5946b0c29..c1b1b1e1dd 100755
--- a/release/src/router/others/entware-setup.sh
+++ b/release/src/router/others/entware-setup.sh
@@ -18,17 +18,50 @@ echo -e "$INFO the old ones will be saved on Entware partition with name"
 echo -e "$INFO like /tmp/mnt/sda1/jffs_scripts_backup.tgz"
 echo
 
-case $(uname -m) in
+PLATFORM=$(uname -m)
+
+if [ "$PLATFORM" == "aarch64" ]
+then
+   echo -e "$INFO This platform supports both 64bit and 32bit Entware installations."
+   echo -e "$INFO 64bit support is recommended, but 32bit support may be required"
+   echo -e "$INFO   if you are using other 32bit applications."
+   echo -e "$INFO The 64bit installation is also better optimized for newer kernels."
+   echo ""
+   echo -en "$INPUT Do you wish to install the 64bit version? (y/n) "
+
+  read -r choice
+  case "$choice" in
+   y|Y )
+     echo -e "$INFO Installing the 64bit version.\n"
+     PLATFORM="aarch64"
+     ;;
+  n|N )
+     echo -e "$INFO Installing the 32bit version.\n"
+     PLATFORM="armv7l"
+     ;;
+  * )
+     echo -e "Invalid option - exiting...\n"
+     exit
+     ;;
+  esac
+fi
+
+case $PLATFORM in
   armv7l)
     PART_TYPES='ext2|ext3|ext4'
-    INST_URL='http://pkg.entware.net/binaries/armv7/installer/entware_install.sh'
+    INST_URL='http://bin.entware.net/armv7sf-k2.6/installer/generic.sh'
     ;;
   mips)
     PART_TYPES='ext2|ext3'
     INST_URL='http://pkg.entware.net/binaries/mipsel/installer/installer.sh'
     ;;
+  aarch64)
+    PART_TYPES='ext2|ext3|ext4'
+    INST_URL='http://bin.entware.net/aarch64-k3.10/installer/generic.sh'
+    ;;
   *)
-    echo "This is unsupported platform, sorry."
+    echo "This is an unsupported platform, sorry."
+    exit 1
     ;;
 esac