Some tweaks

tested and working on ZorinOS and Pop!
This commit is contained in:
Phil Clifford 2022-08-12 00:55:04 +01:00
parent cf592f34c3
commit 303c19668a
2 changed files with 45 additions and 13 deletions

View File

@ -34,7 +34,15 @@ if [ -f /etc/os-release ]; then
. /etc/os-release
OS=$NAME
VER=$VERSION_ID
IDLIKE=$ID_LIKE
UPSTREAM_ID=${ID_LIKE,,}
# Fallback to ID_LIKE if ID was not 'ubuntu' or 'debian'
if [ "${UPSTREAM_ID}" != "debian" ] && [ "${UPSTREAM_ID}" != "ubuntu" ]; then
UPSTREAM_ID="$(echo ${ID_LIKE,,} | sed s/\"//g | cut -d' ' -f1)"
fi
elif type lsb_release >/dev/null 2>&1; then
# linuxbase.org
OS=$(lsb_release -si)
@ -62,18 +70,27 @@ else
VER=$(uname -r)
fi
# output ebugging info if $DEBUG set
if [ "$DEBUG" = "true" ]; then
echo "OS: $OS"
echo "VER: $VER"
echo "UPSTREAM_ID: $UPSTREAM_ID"
exit 0
fi
# Setup prereqs for server
# common named prereqs
prereq="curl wget unzip tar"
echo "Installing prerequisites"
if [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ]; then
if [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then
prereq+=" dnsutils"
apt-get update
apt-get install -y "${prereq}" # git
sudo apt-get update
sudo apt-get install -y "${prereq}" # git
elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ]; then
prereq+=" bind-utils"
yum update -y
yum install -y "${prereq}" # git
sudo yum update -y
sudo yum install -y "${prereq}" # git
else
echo "Unsupported OS"
# here you could ask the user for permission to try and install anyway
@ -182,7 +199,7 @@ while ! [[ $CHECK_RUSTDESK_READY ]]; do
sleep 3
done
pubname=$(find /opt/rustdesk -name *.pub)
pubname=$(find /opt/rustdesk -name "*.pub")
key=$(cat "${pubname}")
rm rustdesk-server-linux-x64.zip

View File

@ -14,7 +14,12 @@ if [ -f /etc/os-release ]; then
. /etc/os-release
OS=$NAME
VER=$VERSION_ID
IDLIKE=$ID_LIKE
UPSTREAM_ID=${ID_LIKE,,}
# Fallback to ID_LIKE if ID was not 'ubuntu' or 'debian'
if [ "${UPSTREAM_ID}" != "debian" ] && [ "${UPSTREAM_ID}" != "ubuntu" ]; then
UPSTREAM_ID="$(echo ${ID_LIKE,,} | sed s/\"//g | cut -d' ' -f1)"
fi
elif type lsb_release >/dev/null 2>&1; then
# linuxbase.org
OS=$(lsb_release -si)
@ -42,18 +47,28 @@ else
VER=$(uname -r)
fi
# output ebugging info if $DEBUG set
if [ "$DEBUG" = "true" ]; then
echo "OS: $OS"
echo "VER: $VER"
echo "UPSTREAM_ID: $UPSTREAM_ID"
exit 0
fi
# Setup prereqs for server
# common named prereqs
prereq="curl wget unzip tar"
echo "Installing prerequisites"
if [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ]; then
if [ "$OS" = "Ubuntu" ] || [ "$OS" = "Debian" ] || [ "${UPSTREAM_ID}" = "ubuntu" ] || [ "${UPSTREAM_ID}" = "debian" ]; then
prereq+=" dnsutils"
apt-get update
apt-get install -y "${prereq}" # git
sudo apt-get update
sudo apt-get install -y "${prereq}" # git
elif [ "$OS" = "CentOS" ] || [ "$OS" = "RedHat" ]; then
prereq+=" bind-utils"
yum update -y
yum install -y "${prereq}" # git
sudo yum update -y
sudo yum install -y "${prereq}" # git
else
echo "Unsupported OS"
# here you could ask the user for permission to try and install anyway