Skip to content

Fix Windows shortcut detection for redirected shell folders #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shannah merged 1 commit into from
Mar 26, 2026
Merged

Fix Windows shortcut detection for redirected shell folders #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions installer/src/main/java/ca/weblite/jdeploy/installer/win/InstallWindows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,19 +465,26 @@ private File installWindowsLink(
link.setRunAsAdministrator(true);
}
link.save();

// Compute and return the shortcut file path based on type

// Return the actual shortcut file path using ShellLink's resolved path,
// which correctly handles redirected folders (e.g., OneDrive Desktop)
String resolvedPath = link.getLinkPath(ShellLink.CURRENT_USER);
if (resolvedPath != null && !resolvedPath.isEmpty()) {
return new File(resolvedPath, appTitle + ".lnk");
}

// Fallback to hardcoded paths if ShellLink path resolution fails
String userHome = System.getProperty("user.home");
String appData = System.getenv("APPDATA");

switch (type) {
case ShellLink.DESKTOP:
return new File(userHome, "Desktop" + File.separator + appTitle + ".lnk");
case ShellLink.PROGRAM_MENU:
return new File(appData, "Microsoft" + File.separator + "Windows" + File.separator +
return new File(appData, "Microsoft" + File.separator + "Windows" + File.separator +
"Start Menu" + File.separator + "Programs" + File.separator + appTitle + ".lnk");
case ShellLink.START_MENU:
return new File(appData, "Microsoft" + File.separator + "Windows" + File.separator +
return new File(appData, "Microsoft" + File.separator + "Windows" + File.separator +
"Start Menu" + File.separator + appTitle + ".lnk");
default:
return null;
Expand Down
117 changes: 87 additions & 30 deletions installer/src/main/java/ca/weblite/jdeploy/installer/win/UninstallWindows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
import ca.weblite.jdeploy.installer.services.ServiceDescriptorService;
import ca.weblite.jdeploy.installer.services.ServiceDescriptorServiceFactory;
import ca.weblite.tools.io.MD5;
import com.izforge.izpack.util.os.ShellLink;
import org.apache.commons.io.FileUtils;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;

public class UninstallWindows {

Expand Down Expand Up @@ -71,7 +74,24 @@ private File getPackagePath() {
return PackagePathResolver.resolvePackagePath(packageName, version, source);
}

private File getStartMenuPath() {
/**
* Resolves the actual Windows Shell folder path for a given link type using the
* Windows Shell API via ShellLink. Returns null if resolution fails.
*/
private String resolveShellFolderPath(int linkType) {
try {
ShellLink link = new ShellLink(linkType, "probe");
String path = link.getLinkPath(ShellLink.CURRENT_USER);
if (path != null && !path.isEmpty()) {
return path;
}
} catch (Exception e) {
System.err.println("Warning: Could not resolve shell folder path for type " + linkType + ": " + e.getMessage());
}
return null;
}

private File getHardcodedStartMenuPath() {
return new File(System.getProperty("user.home") + File.separator +
"AppData" + File.separator +
"Roaming" + File.separator +
Expand All @@ -80,23 +100,48 @@ private File getStartMenuPath() {
"Start Menu");
}

private File getStartMenuLink(String suffix) {
return new File(getStartMenuPath(), new File(appFileName + suffix).getName() + ".lnk");
private File getHardcodedDesktopPath() {
return new File(System.getProperty("user.home") + File.separator + "Desktop");
}

private File getProgramsMenuPath() {
return new File(getStartMenuPath(), "Programs");
/**
* Returns all possible Desktop directory paths where a shortcut might exist.
* Includes both the Windows Shell API-resolved path and the hardcoded fallback.
*/
private Set<File> getDesktopPaths() {
Set<File> paths = new LinkedHashSet<>();
String resolved = resolveShellFolderPath(ShellLink.DESKTOP);
if (resolved != null) {
paths.add(new File(resolved));
}
paths.add(getHardcodedDesktopPath());
return paths;
}

private File getProgramsMenuLink(String suffix) {
return new File(getProgramsMenuPath(), new File(appFileName + suffix).getName() + ".lnk");
/**
* Returns all possible Start Menu directory paths where a shortcut might exist.
*/
private Set<File> getStartMenuPaths() {
Set<File> paths = new LinkedHashSet<>();
String resolved = resolveShellFolderPath(ShellLink.START_MENU);
if (resolved != null) {
paths.add(new File(resolved));
}
paths.add(getHardcodedStartMenuPath());
return paths;
}

private File getDesktopLink(String suffix) {
return new File(
System.getProperty("user.home") + File.separator +
"Desktop" + File.separator + new File(appFileName + suffix).getName() + ".lnk"
);
/**
* Returns all possible Programs Menu directory paths where a shortcut might exist.
*/
private Set<File> getProgramsMenuPaths() {
Set<File> paths = new LinkedHashSet<>();
String resolved = resolveShellFolderPath(ShellLink.PROGRAM_MENU);
if (resolved != null) {
paths.add(new File(resolved));
}
paths.add(new File(getHardcodedStartMenuPath(), "Programs"));
return paths;
}

private File getAppDirPath() {
Expand Down Expand Up @@ -271,38 +316,50 @@ private void scheduleDeleteUninstaller() throws IOException {

private void removeDesktopAlias() {
for (String suffix : new String[]{"", InstallWindows.RUN_AS_ADMIN_SUFFIX}) {
if (getDesktopLink(suffix).exists()) {
System.out.println("Deleting desktop link: "+getDesktopLink(suffix).getAbsolutePath());
getDesktopLink(suffix).delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
getDesktopLink(suffix).getAbsolutePath(), null);
String linkName = new File(appFileName + suffix).getName() + ".lnk";
for (File desktopDir : getDesktopPaths()) {
File link = new File(desktopDir, linkName);
if (link.exists()) {
System.out.println("Deleting desktop link: " + link.getAbsolutePath());
link.delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
link.getAbsolutePath(), null);
}
}
}
}
}

private void removeStartMenuLink() {
for (String suffix : new String[]{"", InstallWindows.RUN_AS_ADMIN_SUFFIX}) {
if (getStartMenuLink(suffix).exists()) {
System.out.println("Deleting start menu link: " + getStartMenuLink(suffix).getAbsolutePath());
getStartMenuLink(suffix).delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
getStartMenuLink(suffix).getAbsolutePath(), null);
String linkName = new File(appFileName + suffix).getName() + ".lnk";
for (File startMenuDir : getStartMenuPaths()) {
File link = new File(startMenuDir, linkName);
if (link.exists()) {
System.out.println("Deleting start menu link: " + link.getAbsolutePath());
link.delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
link.getAbsolutePath(), null);
}
}
}
}
}

private void removeProgramsMenuLink() {
for (String suffix : new String[]{"", InstallWindows.RUN_AS_ADMIN_SUFFIX}) {
if (getProgramsMenuLink(suffix).exists()) {
System.out.println("Deleting programs menu link: " + getProgramsMenuLink(suffix).getAbsolutePath());
getProgramsMenuLink(suffix).delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
getProgramsMenuLink(suffix).getAbsolutePath(), null);
String linkName = new File(appFileName + suffix).getName() + ".lnk";
for (File programsDir : getProgramsMenuPaths()) {
File link = new File(programsDir, linkName);
if (link.exists()) {
System.out.println("Deleting programs menu link: " + link.getAbsolutePath());
link.delete();
if (installationLogger != null) {
installationLogger.logShortcut(InstallationLogger.FileOperation.DELETED,
link.getAbsolutePath(), null);
}
}
}
}
Expand Down
Loading