Merge pull request #189 from TommyE123/master

Mono & Jackett fixes

inc/app-toolkit-deps.sh

@@ -4,6 +4,5 @@ echo -e "$YELLOW--->CHECKING TOOLKIT DEPENDENCIES ...$ENDCOLOR"
 sudo apt-get -qq install apt-transport-https build-essential \
 ca-certificates checkinstall curl dnsutils git lsb-release \
 mediainfo mediainfo-gui p7zip-full par2 sed \
-software-properties-common sqlite3 tar unzip wget zip -y
-
+software-properties-common sqlite3 tar unzip wget zip dirmngr -y
 echo

jackett/jackett-installer.sh

@@ -5,15 +5,14 @@
 # Publisher: http://www.htpcBeginner.com
 # License: MIT License (refer to README.md for more details)
 
-# DO NOT EDIT ANYTHING UNLESS YOU KNOW WHAT YOU ARE DOING.
-
 source "$SCRIPTPATH/inc/app-setup-check.sh"
 source "$SCRIPTPATH/inc/commons.sh"
 source "$SCRIPTPATH/inc/header.sh"
 echo -e "${GREEN}AtoMiC $APPTITLE Installer Script$ENDCOLOR"
 source "$SCRIPTPATH/inc/app-autostart-remove.sh"
 source "$SCRIPTPATH/inc/app-move-previous.sh"
-source "$SCRIPTPATH/inc/pkgupdate.sh"
+source "$SCRIPTPATH/utils/mono/mono-installer.sh"
+source "$SCRIPTPATH/jackett/jackett-constants.sh"
 source "$SCRIPTPATH/inc/app-install-deps.sh"
 source "$SCRIPTPATH/inc/app-folders-create.sh"
 source "$SCRIPTPATH/jackett/jackett-download.sh"

jackett/jackett-update.sh

@@ -5,16 +5,15 @@
 # Publisher: http://www.htpcBeginner.com
 # License: MIT License (refer to README.md for more details)
 
-# DO NOT EDIT ANYTHING UNLESS YOU KNOW WHAT YOU ARE DOING.
-
 source "$SCRIPTPATH/inc/app-setup-check.sh"
 source "$SCRIPTPATH/inc/commons.sh"
 source "$SCRIPTPATH/inc/header.sh"
 echo -e "${GREEN}AtoMiC $APPTITLE Update Script$ENDCOLOR"
 source "$SCRIPTPATH/inc/pause.sh"
 source "$SCRIPTPATH/inc/app-folder-check.sh"
 source "$SCRIPTPATH/inc/app-stop.sh"
-source "$SCRIPTPATH/inc/pkgupdate.sh"
+source "$SCRIPTPATH/utils/mono/mono-installer.sh"
+source "$SCRIPTPATH/jackett/jackett-constants.sh"
 source "$SCRIPTPATH/inc/app-install-deps.sh"
 source "$SCRIPTPATH/inc/app-folders-create.sh"
 source "$SCRIPTPATH/jackett/jackett-download.sh"

utils/mono/mono-constants.sh

@@ -3,10 +3,9 @@
 APPTITLE='Mono'
 APPNAME='mono-complete'
 APPDEPS='libmono-cil-dev'
-APPREPOSITORYNAME='mono-xamarin'
+APPREPOSITORYNAME='mono-official'
 REPKEYSERVER='hkp://keyserver.ubuntu.com:80'
 REPRECVKEYS='3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'
 REPRECVKEYSHORT='D3D831EF'
 REPOPPA='NO'
-APPREPOSITORYLINK="deb http://download.mono-project.com/repo/debian wheezy main"
 REPOKEYSREQ='YES'

utils/mono/mono-installer.sh

@@ -5,7 +5,6 @@
 # Publisher: http://www.htpcBeginner.com
 # License: MIT License (refer to README.md for more details)
 
-# DO NOT EDIT ANYTHING UNLESS YOU KNOW WHAT YOU ARE DOING.
 echo
 echo -e "${GREEN}AtoMiC Mono Installer Script$ENDCOLOR"
 source "$SCRIPTPATH/inc/app-constant-reset.sh"

utils/mono/mono-repository-configurator.sh

@@ -5,15 +5,51 @@
 # Publisher: http://www.htpcBeginner.com
 # License: MIT License (refer to README.md for more details)
 
-# DO NOT EDIT ANYTHING UNLESS YOU KNOW WHAT YOU ARE DOING.
+# Remove the old repo if it exists
+if [[ -f /etc/apt/sources.list.d/mono-xamarin.list ]]; then
+    echo -e "${YELLOW}---> Removing old mono-xamarin.list...$ENDCOLOR"
+    sudo rm "/etc/apt/sources.list.d/mono-xamarin.list"
+    echo 'Done'
+fi
 
+ARCH=$(uname -m)
+ARCHSHORT=${ARCH:0:3}
 CODENAME=$(lsb_release -c -s)
+if [[ $ARCHSHORT = 'arm' ]] && [[ $CODENAME = 'jessie' || $CODENAME = 'stretch' ]]; then
+        case "$CODENAME" in
+        'jessie')
+            TEMPDIST='debian raspbianjessie'
+            ;;
+        'stretch')
+            TEMPDIST='debian raspbianstretch'
+            ;;
+    esac
+else
+    case "$CODENAME" in
+        'wheezy')
+            TEMPDIST='debian wheezy'
+            ;;
+        'jessie')
+            TEMPDIST='debian jessie'
+            ;;
+        'stretch')
+            TEMPDIST='debian stretch'
+            ;;    
+        'xenial'|'serena'|'sarah'|'sonya'|'zesty'|'yakkety'|'artful')
+            TEMPDIST='ubuntu xenial'
+            ;;
+        'trusty'|'rosa'|'rafaela'|'rebecca'|'qiana')
+            TEMPDIST='ubuntu trusty'
+            ;;
+        'precise'|'maya'|'betsy')
+            TEMPDIST='ubuntu precise'
+            ;;
+        *)
+            source "$SCRIPTPATH/inc/invalid-option.sh"
+            ;;
+    esac
+fi
 
-case "$CODENAME" in
-    'squeeze'|'wheezy'|'jessie'|'stretch'|'sid')
-        APPREPOSITORYLINKBACKUP="deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main"
-        ;;
-    *)
-        APPREPOSITORYLINKBACKUP=''
-        ;;
-esac
+if [[ ! $TEMPDIST = '' ]]; then
+    APPREPOSITORYLINK="deb http://download.mono-project.com/repo/$TEMPDIST main"
+fi

utils/mono/mono-uninstaller.sh

@@ -5,11 +5,11 @@
 # Publisher: http://www.htpcBeginner.com
 # License: MIT License (refer to README.md for more details)
 
-# DO NOT EDIT ANYTHING UNLESS YOU KNOW WHAT YOU ARE DOING.
-
 echo -e "${GREEN}AtoMiC $APPTITLE Uninstaller Script$ENDCOLOR"
 source "$SCRIPTPATH/inc/app-setup-check.sh"
 source "$SCRIPTPATH/inc/pause.sh"
 source "$SCRIPTPATH/inc/app-uninstall.sh"
+source "$SCRIPTPATH/inc/app-uninstall-deps.sh"
+source "$SCRIPTPATH/utils/mono/mono-repository-configurator.sh"
 source "$SCRIPTPATH/inc/app-repository-remove.sh"
 source "$SCRIPTPATH/inc/app-uninstall-confirmation.sh"