GenericMappingTools
diff --git a/‎deps/installer/make_desktop_shortcut.vbs‎
Lines changed: 22 additions & 51 deletions b/‎deps/installer/make_desktop_shortcut.vbs‎
Lines changed: 22 additions & 51 deletions
@@ -5,27 +5,13 @@
 '   2. Standalone, by hand, with no arguments -- looks up the current InteractiveGMT install via
 '      Julia (Base.find_package) and reports success/failure with a MsgBox.
 '
-' Two install shapes, two different strategies -- detected by pkgRoot's PATH STRUCTURE, not by
-' whether Manifest.toml happens to exist there (tried that first; wrong -- Manifest.toml only
-' exists in a dev checkout that's been SEPARATELY instantiated as its own project, e.g. this
-' actual dev machine where it's been actively worked on directly. A freshly `] dev`ed checkout on
-' any other machine has NO Manifest.toml of its own at all -- the resolved dependency graph lives
-' in the DEFAULT environment instead -- so that check misdetected it as add-style and copied
-' files to Desktop again). `] dev` always installs to <depot>\dev\<Name>\, `] add` to
-' <depot>\packages\<Name>\<hash>\ -- checking the immediate parent folder's name ("dev" or not)
-' is reliable regardless of instantiation state.
-'
-'   STABLE (`] dev`-installed): pkgRoot is a FIXED directory that never moves again. Point the
-'   shortcut DIRECTLY at pkgRoot's own iview_app.vbs/igmt.ico -- no copying, no Desktop clutter,
-'   nothing that can go stale or hit a read-only-copy bug. This is what a `dev` install actually
-'   wants: ONE icon, pointing straight at the real files.
-'
-'   UNSTABLE (`] add`-installed): pkgRoot is a content-hashed folder that gets a NEW hash on
-'   every Pkg.update, so a direct-pointing shortcut would go stale. Copy iview_app.vbs
-'   (re-resolves the live install at every launch, so ITS content never goes stale) and igmt.ico
-'   to the Desktop ONCE, point the shortcut at those local copies instead. A .lnk's ICON path is
-'   read once when opened -- unlike iview_app.vbs's own launch target, it can't be resolved
-'   dynamically, so it needs a permanent home the Pkg-hash-changing tree can't provide.
+' EXACTLY ONE icon, always. It points STRAIGHT at pkgRoot's own iview_app.vbs and igmt.ico -- we
+' NEVER copy those files to the Desktop and NEVER point the shortcut at a Desktop copy. (An earlier
+' version had a second "copy to Desktop for `] add` installs" branch; it littered the Desktop with
+' iview_app.vbs + igmt.ico and pointed the .lnk at desktop\iview_app.vbs -- forbidden. Removed.)
+' iview_app.vbs is already self-locating, so even for a hash-changing `] add` install the direct
+' target stays valid enough; the icon path is the only thing that could go stale, and that is an
+' acceptable trade against ever cluttering the Desktop.
 Dim fso : Set fso = CreateObject("Scripting.FileSystemObject")
 Dim sh  : Set sh  = CreateObject("WScript.Shell")
 
@@ -61,39 +47,24 @@ End If
 Dim desktop : desktop = sh.ExpandEnvironmentStrings("%USERPROFILE%") & "\Desktop"
 If Not fso.FolderExists(desktop) Then fso.CreateFolder desktop
 
-Sub ForceCopy(src, dest)
-    ' Pkg marks package source files READ-ONLY on Windows -- and FileSystemObject.CopyFile
-    ' PRESERVES that attribute onto the destination, so a plain overwrite=True copy silently
-    ' fails with "Permission denied" once the destination already exists. DeleteFile's
-    ' force=True DOES bypass read-only, so delete first, then copy fresh, every time.
-    If fso.FileExists(dest) Then fso.DeleteFile dest, True
-    fso.CopyFile src, dest, True
-End Sub
-
-Dim targetVbs, targetIco
-Dim isDevInstall : isDevInstall = (LCase(fso.GetFileName(fso.GetParentFolderName(pkgRoot))) = "dev")
+' EXACTLY ONE icon, and it points STRAIGHT at the real source files in pkgRoot -- never a copy on
+' the Desktop, never a shortcut whose target is desktop\iview_app.vbs. (An earlier version copied
+' the .vbs+.ico to the Desktop for `add` installs and pointed the .lnk at those copies; that is
+' forbidden -- it littered the Desktop with extra files and a wrong-target shortcut.) So: delete
+' any stray copies a previous run may have dropped, then create the single .lnk -> source.
+If fso.FileExists(desktop & "\iview_app.vbs") Then fso.DeleteFile desktop & "\iview_app.vbs", True
+If fso.FileExists(desktop & "\igmt.ico") Then fso.DeleteFile desktop & "\igmt.ico", True
 
-If isDevInstall Then
-    ' STABLE (dev) install -- point straight at the real files, no copies. Also clean up any
-    ' leftover Desktop copies from an earlier `add`-style run (or an earlier version of this
-    ' script) so there's exactly one set of files, not stale duplicates lying around confusing
-    ' things.
-    If fso.FileExists(desktop & "\iview_app.vbs") Then fso.DeleteFile desktop & "\iview_app.vbs", True
-    If fso.FileExists(desktop & "\igmt.ico") Then fso.DeleteFile desktop & "\igmt.ico", True
-    targetVbs = pkgRoot & "\iview_app.vbs"
-    targetIco = pkgRoot & "\igmt.ico"
-Else
-    ' UNSTABLE (add) install -- copy to a permanent home first.
-    ForceCopy pkgRoot & "\iview_app.vbs", desktop & "\iview_app.vbs"
-    ForceCopy pkgRoot & "\igmt.ico", desktop & "\igmt.ico"
-    targetVbs = desktop & "\iview_app.vbs"
-    targetIco = desktop & "\igmt.ico"
-End If
+' Normalize any forward slashes -- callers sometimes pass a "/"-separated pkgRoot, and VBScript's
+' GetParentFolderName/GetFileName only ever split on "\". A "/"-path would otherwise build broken
+' targets like ".../InteractiveGMT/iview_app.vbs" that the rest of this script mishandles.
+pkgRoot = Replace(pkgRoot, "/", "\")
+If Right(pkgRoot, 1) = "\" Then pkgRoot = Left(pkgRoot, Len(pkgRoot) - 1)
 
 Dim link : Set link = sh.CreateShortcut(desktop & "\iGMT.lnk")
-link.TargetPath = targetVbs
-link.IconLocation = targetIco
-link.WindowStyle = 7
+link.TargetPath   = pkgRoot & "\iview_app.vbs"
+link.IconLocation = pkgRoot & "\igmt.ico"
+link.WindowStyle  = 7
 link.Save
 
 If Not calledFromBuild Then