From 292c57b7dd2fe01d69e5869602e735f9941d5932 Mon Sep 17 00:00:00 2001 From: Roy <88516395+moraroy@users.noreply.github.com> Date: Sat, 12 Aug 2023 19:25:10 -0700 Subject: [PATCH] ~attempted fix using shutil insteaad in python code ~removed chmod +x --- NonSteamLaunchers.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/NonSteamLaunchers.sh b/NonSteamLaunchers.sh index 81e0172..9af7f3e 100755 --- a/NonSteamLaunchers.sh +++ b/NonSteamLaunchers.sh @@ -2,11 +2,6 @@ # shellcheck disable=SC2155 -# TODO: this is silly -- if the script is being executed, doesn't need to mark itself as executable -# * better to set permissions at a repo-level -# * then an end user would have to explicitly call `chmod -x` to walk it back -chmod +x "$0" - set -x # activate debugging (execution shown) set -o pipefail # capture error from pipes # set -eu # exit immediately, undefined vars are errors @@ -3132,6 +3127,12 @@ if os.path.exists(os.path.join(compatdata_dir, 'NonSteamLaunchers')): # Define the new path of the NonSteamLaunchers folder new_path = os.path.join(compatdata_dir, str(first_app_id)) + # Check if the NonSteamLaunchers directory is empty + if os.listdir(current_path): + # The directory is not empty, so move its contents to the new location + for filename in os.listdir(current_path): + shutil.move(os.path.join(current_path, filename), new_path) + # Rename the NonSteamLaunchers folder os.rename(current_path, new_path) @@ -3139,7 +3140,7 @@ if os.path.exists(os.path.join(compatdata_dir, 'NonSteamLaunchers')): symlink_path = os.path.join(compatdata_dir, 'NonSteamLaunchers') # Create a symbolic link to the renamed NonSteamLaunchers folder - os.symlink(new_path, symlink_path)" + os.symlink(new_path, symlink_path) # TODO: might be better to relocate temp files to `/tmp` or even use `mktemp -d` since `rm -rf` is potentially dangerous without the `-i` flag # Delete NonSteamLaunchersInstallation subfolder in Downloads folder