Upgraded Ubuntu & Ubuntu-Xfce

AndronixApp · Nov 5, 2020 · e7eb213 · e7eb213
1 parent e57c565
commit e7eb213
Show file tree

Hide file tree

Showing 3 changed files with 231 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/Installer/Ubuntu/ubuntu-xfce.sh b/Installer/Ubuntu/ubuntu-xfce.sh
@@ -1,54 +1,117 @@
 #!/data/data/com.termux/files/usr/bin/bash
-pkg install wget -y 
-folder=ubuntu-fs
-dlink="https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/APT"
-if [ -d "$folder" ]; then
-	first=1
-	echo "skipping downloading"
-fi
-tarball="ubuntu-rootfs.tar.xz"
-if [ "$first" != 1 ];then
-	if [ ! -f $tarball ]; then
-		echo "Download Rootfs, this may take a while base on your internet speed."
-		case `dpkg --print-architecture` in
-		aarch64)
-			archurl="arm64" ;;
-		arm)
-			archurl="armhf" ;;
-		amd64)
-			archurl="amd64" ;;
-		x86_64)
-			archurl="amd64" ;;	
-		i*86)
-			archurl="i386" ;;
-		x86)
-			archurl="i386" ;;
-		*)
-			echo "unknown architecture"; exit 1 ;;
-		esac
-		wget "https://github.com/Techriz/AndronixOrigin/blob/master/Rootfs/Ubuntu/${archurl}/ubuntu-rootfs-${archurl}.tar.xz?raw=true" -O $tarball
+
+# Variables
+BLUE="\e[34m"                                                                   # Blue Color
+GREEN="\e[32m"                                                                  # Red Color
+NO_COLOR="\e[39m"                                                               # No Color
+isFsPresent=0                                                                   # Handles if the tarball is downloaded or skipped (overridden by -f)
+distroName="Ubuntu"                                                             # Name of the concerned distro
+name="ubuntu"                                                                   # Name of the concerned distro
+rootfsFolder=$name-fs                                                           # RootFS folder name
+bindsFolder=$name-fs                                                            # Bind folder name
+dlink="https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/APT" # Download Link
+tarball="${name}-rootfs.tar.xz"
+folderSize=$(stat -c%s $rootfsFolder)
+
+# Function used for sending updates to Andronix App
+function sendUpdates() {
+  message=$(echo "$1" | sed 's/ /\\ /g')
+  am broadcast --user 0 -a app.andronix.PROGRESS --es app.andronix.PROGRESS_STATUS "$message" >/dev/null
+}
+
+#Welcome
+echo "
+    ___                __                           _
+   /   |   ____   ____/ /   _____  ____    ____    (_)   _  __
+  / /| |  / __ \ / __  /   / ___/ / __ \  / __ \  / /   | |/_/
+ / ___ | / / / // /_/ /   / /    / /_/ / / / / / / /   _>  <
+/_/  |_|/_/ /_/ \__,_/   /_/     \____/ /_/ /_/ /_/   /_/|_|
+                                                              "
+
+echo -e "\n${BLUE}Welcome to the Andronix ${distroName} installer.${NO_COLOR}"
+echo -e "Join Andronix ${BLUE}Discord${NO_COLOR} @ https://chat.andronix.app (giveaways too ;)"
+echo -e "Read our ${BLUE}Documentation${NO_COLOR} @ https://docs.andronix.app \n\n"
+
+sendUpdates "Script Detected"
+
+sleep 1
+
+# Getting the -f (force download flag)
+while getopts "f" OPTION; do
+  # shellcheck disable=SC2220
+  case $OPTION in
+  f)
+    echo -e "\nForcing the download..."
+    rm -rf $rootfsFolder
+    rm -rf $bindsFolder
+    isFsPresent=0
+    ;;
+  esac
+done
+
+# Installing basic termux packages
+pkg install wget -y
+
+# Checking if the rootfsFolder is present
+if [ -d "$rootfsFolder" ] && [ "$folderSize" -gt 6000 ]; then
+  isFsPresent=1
+  echo -e "\nRoot Files System already present. Skipping download..."
 fi
-	cur=`pwd`
-	mkdir -p "$folder"
-	cd "$folder"
-	echo "Decompressing Rootfs, please be patient."
-	proot --link2symlink tar -xJf ${cur}/${tarball}||:
-	cd "$cur"
+
+if [ "$isFsPresent" != 1 ]; then
+  if [ ! -f "$tarball" ]; then
+    echo -e "\nDownloading Rootfs for ${distroName}. Please be patient...\n\n"
+    case $(dpkg --print-architecture) in
+    aarch64)
+      arch="arm64"
+      ;;
+    arm)
+      arch="armhf"
+      ;;
+    amd64)
+      arch="amd64"
+      ;;
+    x86_64)
+      arch="amd64"
+      ;;
+    i*86)
+      arch="i386"
+      ;;
+    x86)
+      arch="i386"
+      ;;
+    *)
+      echo "There was an issue identifying the architecture of your device!"
+      sendUpdates "Oops! Architecture error."
+      exit 1
+      ;;
+    esac
+    sendUpdates "Downloading the files..."
+    wget -q --show-progress --progress=bar "https://github.com/Techriz/AndronixOrigin/blob/master/Rootfs/${distroName}/${arch}/ubuntu-rootfs-${arch}.tar.xz?raw=true" -O $tarball
+  fi
+  currentDirectory=$(pwd)
+  mkdir -p "$rootfsFolder"
+  cd "$rootfsFolder"
+  sendUpdates "Decompressing the files..."
+  echo -e "\nDecompressing Rootfs. This can take a while. Please be patient."
+  proot --link2symlink tar -xJf "${currentDirectory}"/${tarball} || :
+  cd "$currentDirectory"
 fi
-mkdir -p ubuntu-binds
+
+mkdir -p $bindsFolder
 bin=start-ubuntu.sh
-echo "writing launch script"
-cat > $bin <<- EOM
+echo -e "\nWriting the launch script now! Just a few more steps!"
+cat >$bin <<-EOM
 #!/bin/bash
 cd \$(dirname \$0)
 ## unset LD_PRELOAD in case termux-exec is installed
 unset LD_PRELOAD
 command="proot"
 command+=" --link2symlink"
 command+=" -0"
-command+=" -r $folder"
-if [ -n "\$(ls -A ubuntu-binds)" ]; then
-    for f in ubuntu-binds/* ;do
+command+=" -r $rootfsFolder"
+if [ -n "\$(ls -A $bindsFolder)" ]; then
+    for f in $bindsFolder/* ;do
       . \$f
     done
 fi
@@ -57,7 +120,7 @@ command+=" -b /proc"
 command+=" -b ubuntu-fs/root:/dev/shm"
 ## uncomment the following line to have access to the home directory of termux
 #command+=" -b /data/data/com.termux/files/home:/root"
-## uncomment the following line to mount /sdcard directly to / 
+## uncomment the following line to mount /sdcard directly to /
 #command+=" -b /sdcard"
 command+=" -w /root"
 command+=" /usr/bin/env -i"
@@ -74,20 +137,22 @@ else
 fi
 EOM
 
-echo "fixing shebang of $bin"
 termux-fix-shebang $bin
-echo "making $bin executable"
 chmod +x $bin
-echo "removing image for some space"
+echo "Saving some space..."
 rm $tarball
 
+sendUpdates "Downloading Desktop Environment!"
+
+wget -q --show-progress --progress=bar $dlink/XFCE4/xfce4_de.sh -O $rootfsFolder/root/xfce4_de.sh
+
 #DE installation addition
 
-wget $dlink/XFCE4/xfce4_de.sh -O $folder/root/xfce4_de.sh
+wget $dlink/XFCE4/xfce4_de.sh -O $rootfsFolder/root/xfce4_de.sh
 clear
 echo "Setting up the installation of XFCE VNC"
 
-echo "APT::Acquire::Retries \"3\";" > $folder/etc/apt/apt.conf.d/80-retries #Setting APT retry count
+echo "APT::Acquire::Retries \"3\";" >$rootfsFolder/etc/apt/apt.conf.d/80-retries #Setting APT retry count
 echo "#!/bin/bash
 apt update -y && apt install sudo wget -y
 clear
@@ -107,6 +172,14 @@ fi
 if [ ! -f /usr/bin/vncserver ]; then
     apt install tigervnc-standalone-server -y
 fi
-rm -rf ~/.bash_profile" >> ubuntu-fs/root/.bash_profile 
+rm -rf ~/.bash_profile" >>$rootfsFolder/root/.bash_profile
+
+echo -e "\n\nYay! All done."
+echo -e "\n${GREEN}This is the confirmation only regarding the actual distro. Tracking the installation of the Desktop Environment is beyond the present scope. Please contact us on ${BLUE}Discord${GREEN} if you face any issues.${NO_COLOR}\n"
+echo "You will then asked to configure some distro specific things."
+echo -e "\nProceeding to install the Desktop Environment...\n"
+
+sendUpdates "Installation Success!"
+sleep 4
 
 bash $bin
diff --git a/Installer/Ubuntu/ubuntu.sh b/Installer/Ubuntu/ubuntu.sh
@@ -1,53 +1,115 @@
 #!/data/data/com.termux/files/usr/bin/bash
-pkg install wget -y 
-folder=ubuntu-fs
-if [ -d "$folder" ]; then
-	first=1
-	echo "skipping downloading"
-fi
-tarball="ubuntu-rootfs.tar.xz"
-if [ "$first" != 1 ];then
-	if [ ! -f $tarball ]; then
-		echo "Download Rootfs, this may take a while base on your internet speed."
-		case `dpkg --print-architecture` in
-		aarch64)
-			archurl="arm64" ;;
-		arm)
-			archurl="armhf" ;;
-		amd64)
-			archurl="amd64" ;;
-		x86_64)
-			archurl="amd64" ;;	
-		i*86)
-			archurl="i386" ;;
-		x86)
-			archurl="i386" ;;
-		*)
-			echo "unknown architecture"; exit 1 ;;
-		esac
-		wget "https://github.com/Techriz/AndronixOrigin/blob/master/Rootfs/Ubuntu/${archurl}/ubuntu-rootfs-${archurl}.tar.xz?raw=true" -O $tarball
+
+# Variables
+BLUE="\e[34m"         # Blue Color
+NO_COLOR="\e[39m"     # No Color
+isFsPresent=0         # Handles if the tarball is downloaded or skipped (overridden by -f)
+distroName="Ubuntu"   # Name of the concerned distro
+name="ubuntu"         # Name of the concerned distro
+rootfsFolder=$name-fs # RootFS folder name
+bindsFolder=$name-fs  # Bind folder name
+tarball="${name}-rootfs.tar.xz"
+folderSize=$(stat -c%s $rootfsFolder)
+
+# Function used for sending updates to Andronix App
+function sendUpdates() {
+  message=$(echo "$1" | sed 's/ /\\ /g')
+  am broadcast --user 0 -a app.andronix.PROGRESS --es app.andronix.PROGRESS_STATUS "$message" >/dev/null
+}
+
+#Welcome
+echo "
+    ___                __                           _
+   /   |   ____   ____/ /   _____  ____    ____    (_)   _  __
+  / /| |  / __ \ / __  /   / ___/ / __ \  / __ \  / /   | |/_/
+ / ___ | / / / // /_/ /   / /    / /_/ / / / / / / /   _>  <
+/_/  |_|/_/ /_/ \__,_/   /_/     \____/ /_/ /_/ /_/   /_/|_|
+                                                              "
+
+echo -e "\n${BLUE}Welcome to the Andronix ${distroName} installer.${NO_COLOR}"
+echo -e "Join Andronix ${BLUE}Discord${NO_COLOR} @ https://chat.andronix.app (giveaways too ;)"
+echo -e "Read our ${BLUE}Documentation${NO_COLOR} @ https://docs.andronix.app \n\n"
+
+sendUpdates "Script Detected"
+
+sleep 1
+
+# Getting the -f (force download flag)
+while getopts "f" OPTION; do
+  # shellcheck disable=SC2220
+  case $OPTION in
+  f)
+    echo -e "\nForcing the download..."
+    rm -rf $rootfsFolder
+    rm -rf $bindsFolder
+    isFsPresent=0
+    ;;
+  esac
+done
+
+# Installing basic termux packages
+pkg install wget -y
+
+# Checking if the rootfsFolder is present
+if [ -d "$rootfsFolder" ] && [ "$folderSize" -gt 6000 ]; then
+  isFsPresent=1
+  echo -e "\nRoot Files System already present. Skipping download..."
 fi
-	cur=`pwd`
-	mkdir -p "$folder"
-	cd "$folder"
-	echo "Decompressing Rootfs, please be patient."
-	proot --link2symlink tar -xJf ${cur}/${tarball}||:
-	cd "$cur"
+
+if [ "$isFsPresent" != 1 ]; then
+  if [ ! -f "$tarball" ]; then
+    echo -e "\nDownloading Rootfs for ${distroName}. Please be patient...\n\n"
+    case $(dpkg --print-architecture) in
+    aarch64)
+      arch="arm64"
+      ;;
+    arm)
+      arch="armhf"
+      ;;
+    amd64)
+      arch="amd64"
+      ;;
+    x86_64)
+      arch="amd64"
+      ;;
+    i*86)
+      arch="i386"
+      ;;
+    x86)
+      arch="i386"
+      ;;
+    *)
+      echo "There was an issue identifying the architecture of your device!"
+      sendUpdates "Oops! Architecture error."
+      exit 1
+      ;;
+    esac
+    sendUpdates "Downloading the files..."
+    wget -q --show-progress --progress=bar "https://github.com/Techriz/AndronixOrigin/blob/master/Rootfs/${distroName}/${arch}/ubuntu-rootfs-${arch}.tar.xz?raw=true" -O $tarball
+  fi
+  currentDirectory=$(pwd)
+  mkdir -p "$rootfsFolder"
+  cd "$rootfsFolder"
+  sendUpdates "Decompressing the files..."
+  echo -e "\nDecompressing Rootfs. This can take a while. Please be patient."
+  proot --link2symlink tar -xJf "${currentDirectory}"/${tarball} || :
+  cd "$currentDirectory"
 fi
-mkdir -p ubuntu-binds
+
+mkdir -p $bindsFolder
 bin=start-ubuntu.sh
-echo "writing launch script"
-cat > $bin <<- EOM
+echo -e "\nWriting the launch script now! Just a few more steps!"
+cat >$bin <<-EOM
 #!/bin/bash
 cd \$(dirname \$0)
 ## unset LD_PRELOAD in case termux-exec is installed
 unset LD_PRELOAD
 command="proot"
 command+=" --link2symlink"
 command+=" -0"
-command+=" -r $folder"
-if [ -n "\$(ls -A ubuntu-binds)" ]; then
-    for f in ubuntu-binds/* ;do
+command+=" -r $rootfsFolder"
+if [ -n "\$(ls -A $bindsFolder)" ]; then
+    for f in $bindsFolder/* ;do
       . \$f
     done
 fi
@@ -56,7 +118,7 @@ command+=" -b /proc"
 command+=" -b ubuntu-fs/root:/dev/shm"
 ## uncomment the following line to have access to the home directory of termux
 #command+=" -b /data/data/com.termux/files/home:/root"
-## uncomment the following line to mount /sdcard directly to / 
+## uncomment the following line to mount /sdcard directly to /
 #command+=" -b /sdcard"
 command+=" -w /root"
 command+=" /usr/bin/env -i"
@@ -73,10 +135,14 @@ else
 fi
 EOM
 
-echo "fixing shebang of $bin"
 termux-fix-shebang $bin
-echo "making $bin executable"
 chmod +x $bin
-echo "removing image for some space"
+echo "Saving some space..."
 rm $tarball
-echo "You can now launch Ubuntu with the ./${bin} script"
+echo -e "\n\nYay! All done. You can now start ${distroName} with running ${BLUE}\n./${bin}${NO_COLOR}"
+echo "You will then asked to configure some distro specific things."
+
+sendUpdates "Installation Success!"
+
+sleep 1
+echo "Exiting...Bye!"