diff --git a/core/install.sh b/core/install.sh index 297b5b830..2aff192b1 100755 --- a/core/install.sh +++ b/core/install.sh @@ -8,7 +8,7 @@ GREEN='\033[0;32m' NC='\033[0m' # No Color # Check for root privileges -if [ "$(id -u)" == "0" ]; then +if [ "$(id -u)" = "0" ]; then printf "%bError: This script must not be run as root%b\n" "$RED" "$NC" exit 1 fi diff --git a/distro/obs-project.conf b/distro/obs-project.conf index ab0a628b0..35ce653ef 100644 --- a/distro/obs-project.conf +++ b/distro/obs-project.conf @@ -3,9 +3,9 @@ # To apply changes: osc meta prjconf home:AvengeMedia:dms -F distro/obs-project.conf # osc meta prjconf home:AvengeMedia:dms-git -F distro/obs-project.conf -# Debian sid (dpkg 1.23) dropped the `tar` dependency from dpkg-dev, so tar no -# longer lands in the OBS buildroot preinstall set and dpkg fails on the first -# package install with "'tar' not found in PATH". Force-preinstall it. -%if "%{?_repository}" == "Debian_Unstable" +# Debian testing and sid (dpkg 1.23) dropped the `tar` dependency from dpkg-dev, +# so tar no longer lands in the OBS buildroot preinstall set and dpkg fails on +# the first package install with "'tar' not found in PATH". Force-preinstall it. +%if "%{?_repository}" == "Debian_Unstable" || "%{?_repository}" == "Debian_Testing" Preinstall: tar %endif