Skip to content

Commit

Permalink
Merge pull request #432 from V33m/patch-1
Browse files Browse the repository at this point in the history
Fixes issues #246 and #431
  • Loading branch information
arakasi72 authored Sep 12, 2019
2 parents 90072e5 + 2f7ad34 commit bfee5f2
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions scripts/rtinst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ fullrel=$(lsb_release -sd)
osname=$(lsb_release -si)
relno=$(lsb_release -sr | cut -d. -f1)

# Fallback if lsb_release -si returns nothing
if [ "$osname" = "" ]; then
osname=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
osname=${osname^}
fi

# Fallback if lsb_release -sr returns nothing
if [ "$relno" = "" ]; then
relno=$(grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"')
fi

if [ "$relno" = "16" ] || [ "$relno" = "17" ] || [ "$relno" = "9" ]; then
phpver=php7.0
phploc=/etc/php/7.0
Expand Down Expand Up @@ -545,6 +556,11 @@ for package_name in $package_list
fi
done

# Installs a package needed to prevent arm64 architectures from "WARNING: Unable to start rtorrent"
if [ "$(uname --m)" == "aarch64" ] || [ "$(dpkg --print-architecture)" == "arm64" ] ; then
sudo apt-get install libxmlrpc-core-c3-dev
fi

test -z "$install_list" || apt-get -qq install $install_list >> $logfile 2>&1
if ! [ $? = 0 ]; then
echo "Problem installing packages. Check log and rerun once it is resolved" && exit
Expand Down

0 comments on commit bfee5f2

Please sign in to comment.