From 16346347b5c752eeb0876dca6ac0d997cf974438 Mon Sep 17 00:00:00 2001 From: Roy <88516395+moraroy@users.noreply.github.com> Date: Mon, 29 Jan 2024 23:22:23 -0800 Subject: [PATCH] reverted --- NonSteamLaunchers.sh | 59 +++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/NonSteamLaunchers.sh b/NonSteamLaunchers.sh index 99706f8..a6d44d2 100755 --- a/NonSteamLaunchers.sh +++ b/NonSteamLaunchers.sh @@ -48,7 +48,18 @@ args=("$@") -#Download Modules + + + +# Check if "Decky Plugin" is one of the arguments +decky_plugin=false +for arg in "${args[@]}"; do + if [ "$arg" = "Decky Plugin" ]; then + decky_plugin=true + break + fi +done + # Define the repository and the folders to clone repo_url='https://github.com/moraroy/NonSteamLaunchers-On-Steam-Deck/archive/refs/heads/main.zip' folders_to_clone=('requests' 'urllib3' 'steamgrid') @@ -88,8 +99,6 @@ if [ "${folders_exist}" = false ]; then rm "${zip_file_path}" rm -r "${parent_folder}/NonSteamLaunchers-On-Steam-Deck-main" fi -#End of Download Modules - #Service File rough update rm -rf ${logged_in_home}/.config/systemd/user/NSLGameScanner.py @@ -112,40 +121,25 @@ curl -o $python_script_path $github_link # Define the path to the env_vars file env_vars="${logged_in_home}/.config/systemd/user/env_vars" -#End of Rough Update of the .py - - - - - - - -# Check if "Decky Plugin" is one of the arguments -decky_plugin=false -for arg in "${args[@]}"; do - if [ "$arg" = "Decky Plugin" ]; then - decky_plugin=true - break - fi -done - -# If the Decky Plugin argument is set, check if the env_vars file exists -if [ "$decky_plugin" = true ]; then - if [ -f "$env_vars" ]; then - # If the env_vars file exists, run the .py file and continue with the script - echo "Decky Plugin argument set and env_vars file found. Running the .py file..." +# Check if the env_vars file exists +if [ -f "$env_vars" ]; then + # If the file exists and the decky_plugin argument is set, run the .py file and then exit + if [ "$decky_plugin" = true ]; then + echo "env_vars file found and Decky Plugin argument set. Running the .py file..." python3 $python_script_path - echo "Python script ran. Continuing with the script..." - else - # If the env_vars file does not exist, exit the script - echo "Decky Plugin argument set but env_vars file not found. Exiting the script." + echo "Python script ran. Exiting the script." exit 0 + else + # If the file exists but the decky_plugin argument is not set, run the .py file + echo "env_vars file found but Decky Plugin argument not set. Running the .py file..." + python3 $python_script_path + live="and is LIVE." fi else - # If the Decky Plugin argument is not set, continue with the script - echo "Decky Plugin argument not set. Continuing with the script..." - python3 $python_script_path + # If the file does not exist, do not run the .py file + echo "env_vars file not found. Not running the .py file." + live="and is NOT LIVE." fi @@ -153,7 +147,6 @@ fi - # Check if any command line arguments were provided if [ ${#args[@]} -eq 0 ]; then # No command line arguments were provided, so check for updates and display the zenity window if necessary