nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fedora fixes

Browse Source
This commit is contained in:
TotallyNotElite 2019-10-15 20:00:08 +02:00
parent 7f5de13bef
commit c96ec19d88
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install-all
View File

@ -12,21 +12,18 @@ set -e
# Update cathook # Update cathook
# #
if [ ! -d "./.git" ]; then if [ ! -d "./.git" ]; then
$RUNUSER git init $RUNCMD git init
$RUNUSER git remote add origin https://github.com/nullworks/cathook $RUNCMD git remote add origin https://github.com/nullworks/cathook
fi 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 # 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 # Build cathook
# #
$RUNUSER ./scripts/updater false true $RUNCMD ./scripts/updater false true

9
scripts/dependencycheck
View File

@ -2,7 +2,7 @@
arch_packages=(git boost cmake make gcc gdb lib32-sdl2 lib32-glew lib32-freetype2 rsync lib32-libglvnd dialog) 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) 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 { function requestPermissions {
string=$@ string=$@
@ -62,12 +62,11 @@ elif [ "$OS" == "ubuntu" ]; then
sudo apt-get install -y "${ubuntu_packages[@]}" sudo apt-get install -y "${ubuntu_packages[@]}"
fi fi
elif [ "$OS" == "fedora" ]; then elif [ "$OS" == "fedora" ]; then
string=${fedora_packages[@]} rpm -q "${fedora_packages[@]}" > /dev/null 2>&1
rpm -q "${string}" > /dev/null 2>&1
out=$? out=$?
if [ "$out" == 1 ]; then if [ "$out" != 0 ]; then
requestPermissions "${fedora_packages[@]}" requestPermissions "${fedora_packages[@]}"
sudo dnf install -y "${string}" sudo dnf install -y ${fedora_packages[@]}
fi fi
else else
echo -e "\033[1;33m\nWarning! Automatic package installation is not supported!\n\033[0m" echo -e "\033[1;33m\nWarning! Automatic package installation is not supported!\n\033[0m"