From 388dbaaf60963596a360166f9c77362e25c38fd7 Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Thu, 5 Nov 2020 22:48:45 -0800
Subject: [PATCH 1/6] Update install.sh

Addd multi arch support to installer script.
---
 scripts/install.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 7b9227b74..08430dd45 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -668,7 +668,17 @@ text_input() {
 
 
 
-releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)
+arch=$(uname -m)
+if [[ $arch == x86_64 ]]; then
+    echo "x86_64 Architecture"
+    releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*amd64.deb" | cut -d '"' -f 4)
+elif [[ $arch == aarch64 ]]; then
+    echo "ARM64 Architecture"
+    releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*arm64.deb" | cut -d '"' -f 4)
+elif  [[ $arch == arm* ]]; then
+    echo "ARM Architecture"
+    releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)
+fi
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1"
 IFS='/' read -ra version <<< "$releaseURL"
 

From 73d42cccf4b83e778dd4924af724cb65b6fe9193 Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Fri, 6 Nov 2020 00:39:39 -0800
Subject: [PATCH 2/6] Update install.sh

Added additional deps reported here (https://github.com/UnchartedBull/OctoDash/wiki/Troubleshooting#not-starting-automatically)
---
 scripts/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 08430dd45..3636e627e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -679,7 +679,7 @@ elif  [[ $arch == arm* ]]; then
     echo "ARM Architecture"
     releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)
 fi
-dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1"
+dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1 libpam0g-dev libx11-dev"
 IFS='/' read -ra version <<< "$releaseURL"
 
 echo "Installing OctoDash "${version[7]}

From f2280971bc7067497f707ea1024b1ea242ffa8ab Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Fri, 6 Nov 2020 18:50:53 -0800
Subject: [PATCH 3/6] Update install.sh

Added arch info to Installing OctDash echo line, and removed arch echos.
---
 scripts/install.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 3636e627e..7fc8cb3c0 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -670,19 +670,16 @@ text_input() {
 
 arch=$(uname -m)
 if [[ $arch == x86_64 ]]; then
-    echo "x86_64 Architecture"
     releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*amd64.deb" | cut -d '"' -f 4)
 elif [[ $arch == aarch64 ]]; then
-    echo "ARM64 Architecture"
     releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*arm64.deb" | cut -d '"' -f 4)
 elif  [[ $arch == arm* ]]; then
-    echo "ARM Architecture"
     releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)
 fi
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1 libpam0g-dev libx11-dev"
 IFS='/' read -ra version <<< "$releaseURL"
 
-echo "Installing OctoDash "${version[7]}
+echo "Installing OctoDash "${version[7]} $arch
 
 echo "Installing Dependencies ..."
 sudo apt -qq update

From 675bdbd164da21587b5027782c2068b62475ae55 Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Fri, 6 Nov 2020 18:52:06 -0800
Subject: [PATCH 4/6] Update install.sh

forgot comma
---
 scripts/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 7fc8cb3c0..0cfbe33c9 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -679,7 +679,7 @@ fi
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1 libpam0g-dev libx11-dev"
 IFS='/' read -ra version <<< "$releaseURL"
 
-echo "Installing OctoDash "${version[7]} $arch
+echo "Installing OctoDash "${version[7]}, $arch
 
 echo "Installing Dependencies ..."
 sudo apt -qq update

From 86631b61d4b25b7e2bc833d5b0fb23b93f75ae17 Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Sun, 8 Nov 2020 22:04:18 -0800
Subject: [PATCH 5/6] Update install.sh

Made sure that all echo "Installing OctoDash..." along w/ final echo of successful install provided version and arch info
---
 scripts/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 0cfbe33c9..d96f9653d 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -730,7 +730,7 @@ if [ $DIRECTORY != "-" ]; then
   fi;
 fi;
 
-echo "Installing OctoDash ..."
+echo "Installing OctoDash "${version[7]}, $arch..."
 cd ~
 wget -O octodash.deb $releaseURL -q --show-progress
 
@@ -789,7 +789,7 @@ fi
 
 
 list_input "Shall I reboot your Pi now?" yes_no reboot
-echo "OctoDash has been successfully installed! :)"
+echo "OctoDash "${version[7]} $arch" has been successfully installed! :)"
 if [ $reboot == 'yes' ]; then
     sudo reboot
 fi

From 538480d7d21a4f02154a8dfc37d39c27d6df3dd0 Mon Sep 17 00:00:00 2001
From: Will-wastelander <71540407+Will-wastelander@users.noreply.github.com>
Date: Mon, 9 Nov 2020 10:25:27 -0800
Subject: [PATCH 6/6] Update install.sh

Corrected missing " in echo lines. Removed version and arch from last echo line.
---
 scripts/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index d96f9653d..39aa227ca 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -679,7 +679,7 @@ fi
 dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc desktop-file-utils libavahi-compat-libdnssd1 libpam0g-dev libx11-dev"
 IFS='/' read -ra version <<< "$releaseURL"
 
-echo "Installing OctoDash "${version[7]}, $arch
+echo "Installing OctoDash "${version[7]}, $arch""
 
 echo "Installing Dependencies ..."
 sudo apt -qq update
@@ -730,7 +730,7 @@ if [ $DIRECTORY != "-" ]; then
   fi;
 fi;
 
-echo "Installing OctoDash "${version[7]}, $arch..."
+echo "Installing OctoDash "${version[7]}, $arch" ..."
 cd ~
 wget -O octodash.deb $releaseURL -q --show-progress
 
@@ -789,7 +789,7 @@ fi
 
 
 list_input "Shall I reboot your Pi now?" yes_no reboot
-echo "OctoDash "${version[7]} $arch" has been successfully installed! :)"
+echo "OctoDash has been successfully installed! :)"
 if [ $reboot == 'yes' ]; then
     sudo reboot
 fi