From 10fd023f56f259538d580f0f708051a353563dfa Mon Sep 17 00:00:00 2001
From: doylet <doyle.github.2ifxi@simplelogin.com>
Date: Sun, 15 Feb 2026 12:43:52 +1100
Subject: [PATCH] Simplify

---
 devenver.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/devenver.py b/devenver.py
index 0255b61..dc979f9 100644
--- a/devenver.py
+++ b/devenver.py
@@ -138,9 +138,6 @@ def get_exe_install_path(install_dir, label, version_label, exe_rel_path):
     result      = pathlib.Path(install_dir, exe_rel_path)
     return result
 
-def get_exe_symlink_dir(install_dir):
-    result = pathlib.Path(install_dir, "Symlinks")
-    return result
 
 def download_and_install_archive(download_url,
                                  download_checksum,
@@ -377,7 +374,7 @@ def download_and_install_archive(download_url,
 
     # Do the symlinks
     # --------------------------------------------------------------------------
-    symlink_dir                   = get_exe_symlink_dir(install_dir)
+    symlink_dir = install_dir
     paths_to_add_to_devenv_script = set()
     for exe_dict in exe_list:
         exe_rel_path = exe_dict['path']
@@ -798,13 +795,10 @@ def run(user_app_list,
         devenv_script_buffer += "set devenver_root=%devenver_root_backslash:~0,-1%\n"
         devenv_script_buffer += "set devenver_root_backslash=\n"
 
-        devenv_script_buffer += "set path=%~dp0Symlinks;%PATH%\n"
-        devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n"
-        devenv_script_buffer += "set path=%~dp0..\PC\Programs;%PATH%\n"
+        devenv_script_buffer += "set path=%~dp0;%PATH%\n"
     else:
         devenv_script_buffer += f"export devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\"\n"
-        devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n"
-        devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n"
+        devenv_script_buffer += f'PATH="$( cd -- $( dirname -- "${BASH_SOURCE[0]}" ) &> /dev/null && pwd )":$PATH\n'
         devenv_script_buffer += f"PATH=$(echo $PATH | awk -v RS=: -v ORS=: '/^\/mnt\/c/ {{next}} {{print}}')\n"
         devenv_script_buffer += f"source $devenver_root/unix_fzf-completion.bash\n"
         devenv_script_buffer += f"source $devenver_root/unix_fzf-key-bindings.bash\n"