diff options
| author | Party Wumpus <48649272+PartyWumpus@users.noreply.github.com> | 2023-08-28 15:46:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 15:46:15 +0100 |
| commit | d9573dc26f9e2150e735d71d49a230b8aa97d474 (patch) | |
| tree | 8dce563674eb87ddb828026270ee1dca05e69029 | |
| parent | 16ca9facb37ac4dedf3ae6e6b7502f6733e73df6 (diff) | |
| parent | 8c3e0f90187c9b89c34faed814acc1890335cebe (diff) | |
| download | decky-installer-d9573dc26f9e2150e735d71d49a230b8aa97d474.tar.gz decky-installer-d9573dc26f9e2150e735d71d49a230b8aa97d474.zip | |
Merge pull request #13 from RodoMa92/RodoMa92-fix-selinuxv1.7.0
(hotfix) This fixes SELinux issues on the latest installer
| -rw-r--r-- | cli/install_prerelease.sh | 4 | ||||
| -rw-r--r-- | cli/install_release.sh | 4 | ||||
| -rw-r--r-- | gui/user_install_script.sh | 4 |
3 files changed, 12 insertions, 0 deletions
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 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 diff --git a/gui/user_install_script.sh b/gui/user_install_script.sh index 624fa06..b137745 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 "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 echo "70" ; echo "# Kiling plugin_loader if it exists" ; |