Skip to content

Commit

Permalink
OS detection updated
Browse files Browse the repository at this point in the history
Ubuntu 19 excluded
tccheck added
debian - dependeny python-docker added
  • Loading branch information
MrDoobPG authored and MrDoobPG committed Nov 15, 2019
1 parent 11c85ff commit 8c82e79
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 5 deletions.
3 changes: 1 addition & 2 deletions menu/dependency/dependencydeb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
- { package: 'gnupg2' }
- { package: 'python-apt' }
- { package: 'rsync' }
- { package: 'python-docker' }

- name: Update pip packages for python3
pip:
Expand All @@ -59,7 +60,5 @@
- requests
- netaddr
- lxml
- docker
- docker-py
state: latest
executable: pip3
7 changes: 5 additions & 2 deletions menu/functions/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ readrcloneconfig() {
echo "good" >/var/plexguide/rclone/tdrive.status && tdstatus="good"
else echo "bad" >/var/plexguide/rclone/tdrive.status && tdstatus="bad"; fi

}
tccheck=$(cat /opt/appdata/plexguide/rclone.conf | grep "remote = tdrive:/encrypt")
if [ "$tccheck" != "" ]; then
echo "good" >/var/plexguide/rclone/tcrypt.status && tcstatus="good"
else echo "bad" >/var/plexguide/rclone/tcrypt.status && tcstatus="bad"; fi

rcloneconfig() {
rclone config --config /opt/appdata/plexguide/rclone.conf
rclone config --config /opt/appdata/plexguide/rclone.conf)
}

keysprocessed() {
Expand Down
20 changes: 19 additions & 1 deletion menu/functions/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,25 @@ updateprime() {
file="${abc}/new.install"
if [ ! -e "$file" ]; then newinstall; fi

ospgversion=$(cat /etc/*-release | grep Debian | grep 9)
versioncheck=$(cat /etc/*-release | grep "Ubuntu" | grep -E '19')
if [ "$versioncheck" == "19" ]; then
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
⛔ Argggggg ...... System Warning!
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
Supported: UBUNTU 16.xx - 18.10 ~ LTS/SERVER and Debian 9.* / 10
This server may not be supported due to having the incorrect OS detected!
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
EOF
exit 1
else
echo "18" >${abc}/os.version.check;
fi

ospgversion=$(cat /etc/*-release | grep Debian | grep -E '9|10')
if [ "$ospgversion" != "" ]; then
echo "debian" >${abc}/os.version
else
Expand Down

0 comments on commit 8c82e79

Please sign in to comment.