From c96ec19d88eb7ab7da0ca6c42914343fd5579b32 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Tue, 15 Oct 2019 20:00:08 +0200
Subject: [PATCH] more fedora fixes

---
 install-all             | 11 ++++-------
 scripts/dependencycheck |  9 ++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/install-all b/install-all
index 9b4cb109..eed0cb07 100755
--- a/install-all
+++ b/install-all
@@ -12,21 +12,18 @@ set -e
 # Update cathook
 #
 if [ ! -d "./.git" ]; then
-    $RUNUSER git init
-    $RUNUSER git remote add origin https://github.com/nullworks/cathook
+    $RUNCMD git init
+    $RUNCMD git remote add origin https://github.com/nullworks/cathook
 fi
 
-$RUNUSER git fetch --force --depth 1 origin refs/tags/latest:refs/tags/latest && $RUNUSER git reset --hard latest # pull changes from github
-$RUNUSER git submodule update --depth 1 --init --recursive # update/init submodules
-
 #
 # Set config version for update script
 #
 
-$RUNUSER bash -c ". ./scripts/config.shlib; cfg_write ./scripts/updater-preferences version 1"
+$RUNCMD bash -c ". ./scripts/config.shlib; cfg_write ./scripts/updater-preferences version 1"
 
 #
 # Build cathook
 #
 
-$RUNUSER ./scripts/updater false true
+$RUNCMD ./scripts/updater false true
diff --git a/scripts/dependencycheck b/scripts/dependencycheck
index 620889f1..a33126e5 100755
--- a/scripts/dependencycheck
+++ b/scripts/dependencycheck
@@ -2,7 +2,7 @@
 
 arch_packages=(git boost cmake make gcc gdb lib32-sdl2 lib32-glew lib32-freetype2 rsync lib32-libglvnd dialog)
 ubuntu_packages=(software-properties-common build-essential git g++ g++-multilib libboost-all-dev gdb libsdl2-dev:i386 libglew-dev:i386 libfreetype6-dev:i386 cmake dialog rsync)
-fedora_packages=(cmake dialog make g++ glibc-devel.i686 libstdc++-devel.i686 freetype-devel.i686 SDL2-devel.i686 glew-devel.i686 boost-devel.i686 rsync gdb git)
+fedora_packages=(cmake dialog make gcc-c++ glibc-devel.i686 freetype-devel.i686 SDL2-devel.i686 glew-devel.i686 boost-devel.i686 rsync gdb git)
 
 function requestPermissions {
     string=$@
@@ -62,12 +62,11 @@ elif [ "$OS" == "ubuntu" ]; then
         sudo apt-get install -y "${ubuntu_packages[@]}"
     fi
 elif [ "$OS" == "fedora" ]; then
-    string=${fedora_packages[@]}
-    rpm -q "${string}" > /dev/null 2>&1
+    rpm -q "${fedora_packages[@]}" > /dev/null 2>&1
     out=$?
-    if [ "$out" == 1 ]; then
+    if [ "$out" != 0 ]; then
         requestPermissions "${fedora_packages[@]}"
-        sudo dnf install -y "${string}"
+        sudo dnf install -y ${fedora_packages[@]}
     fi
 else
     echo -e "\033[1;33m\nWarning! Automatic package installation is not supported!\n\033[0m"