From 8b18260b2719bf0416348019cf062d5a331144d1 Mon Sep 17 00:00:00 2001 From: Marco Rodolfi Date: Mon, 28 Aug 2023 12:32:02 +0200 Subject: Fix SELinux on GUI installer --- gui/user_install_script.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gui/user_install_script.sh b/gui/user_install_script.sh index 624fa06..92c9b9e 100644 --- a/gui/user_install_script.sh +++ b/gui/user_install_script.sh @@ -144,6 +144,10 @@ echo "45" ; echo "# Installing version $VERSION" ; # make another zenity prompt while downloading the PluginLoader file, I do not know how this works curl -L $DOWNLOADURL -o ${HOMEBREW_FOLDER}/services/PluginLoader 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zen_nospam --progress --title "Downloading Decky" --text="Download Speed: 0" --width=300 --height=100 --auto-close --no-cancel chmod +x ${HOMEBREW_FOLDER}/services/PluginLoader + +echo "Check for SELinux presence and if it is present, set the correct permission on the binary file..." +hash getenforce 2>/dev/null && getenforce | grep "Enforcing" >/dev/null && chcon -t bin_t ${HOMEBREW_FOLDER}/services/PluginLoader + echo $VERSION > ${HOMEBREW_FOLDER}/services/.loader.version echo "70" ; echo "# Kiling plugin_loader if it exists" ; -- cgit v1.2.3 From a0a35127877ed5fcc16c525032993b6303bb438c Mon Sep 17 00:00:00 2001 From: Marco Rodolfi Date: Mon, 28 Aug 2023 12:32:45 +0200 Subject: Same for prerelease --- cli/install_prerelease.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/install_prerelease.sh b/cli/install_prerelease.sh index 9c2c2ab..1f5d2f2 100644 --- a/cli/install_prerelease.sh +++ b/cli/install_prerelease.sh @@ -36,6 +36,10 @@ DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoa printf "Installing version %s...\n" "${VERSION}" curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader chmod +x ${HOMEBREW_FOLDER}/services/PluginLoader + +echo "Check for SELinux presence and if it is present, set the correct permission on the binary file..." +hash getenforce 2>/dev/null && getenforce | grep "Enforcing" >/dev/null && chcon -t bin_t ${HOMEBREW_FOLDER}/services/PluginLoader + echo $VERSION > ${HOMEBREW_FOLDER}/services/.loader.version systemctl --user stop plugin_loader 2> /dev/null -- cgit v1.2.3 From 40d12075f714e5c60e16f4b3983f82a60c15ded3 Mon Sep 17 00:00:00 2001 From: Marco Rodolfi Date: Mon, 28 Aug 2023 12:33:12 +0200 Subject: And for release --- cli/install_release.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/install_release.sh b/cli/install_release.sh index ba1a82f..be5c55d 100644 --- a/cli/install_release.sh +++ b/cli/install_release.sh @@ -36,6 +36,10 @@ DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoa printf "Installing version %s...\n" "${VERSION}" curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader chmod +x ${HOMEBREW_FOLDER}/services/PluginLoader + +echo "Check for SELinux presence and if it is present, set the correct permission on the binary file..." +hash getenforce 2>/dev/null && getenforce | grep "Enforcing" >/dev/null && chcon -t bin_t ${HOMEBREW_FOLDER}/services/PluginLoader + echo $VERSION > ${HOMEBREW_FOLDER}/services/.loader.version systemctl --user stop plugin_loader 2> /dev/null -- cgit v1.2.3 From 8c3e0f90187c9b89c34faed814acc1890335cebe Mon Sep 17 00:00:00 2001 From: Party Wumpus <48649272+PartyWumpus@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:43:08 +0100 Subject: add percentage completion when doing the selinux bit --- gui/user_install_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/user_install_script.sh b/gui/user_install_script.sh index 92c9b9e..b137745 100644 --- a/gui/user_install_script.sh +++ b/gui/user_install_script.sh @@ -145,7 +145,7 @@ echo "45" ; echo "# Installing version $VERSION" ; curl -L $DOWNLOADURL -o ${HOMEBREW_FOLDER}/services/PluginLoader 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zen_nospam --progress --title "Downloading Decky" --text="Download Speed: 0" --width=300 --height=100 --auto-close --no-cancel chmod +x ${HOMEBREW_FOLDER}/services/PluginLoader -echo "Check for SELinux presence and if it is present, set the correct permission on the binary file..." +echo "60"; echo "Running SELinux fix if it is enabled" hash getenforce 2>/dev/null && getenforce | grep "Enforcing" >/dev/null && chcon -t bin_t ${HOMEBREW_FOLDER}/services/PluginLoader echo $VERSION > ${HOMEBREW_FOLDER}/services/.loader.version -- cgit v1.2.3