Merge pull request Squirrel#201 from Squirrel/specify-shortcut-locations

Specify Shortcut Locations on Update.exe
akrisiun · Jan 23, 2015 · 6b75184 · 6b75184
2 parents 0548edd + f0077cb
commit 6b75184
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/Squirrel/IUpdateManager.cs b/src/Squirrel/IUpdateManager.cs
@@ -13,6 +13,7 @@ namespace Squirrel
 {
     [Flags]
     public enum ShortcutLocation {
+        None = 0,
         StartMenu = 1 << 0,
         Desktop = 1 << 1,
         Startup = 1 << 2,

diff --git a/src/Squirrel/UpdateManager.ApplyReleases.cs b/src/Squirrel/UpdateManager.ApplyReleases.cs
@@ -115,6 +115,7 @@ public void CreateShortcutsForExecutable(string exeName, ShortcutLocation locati
                 var fileVerInfo = FileVersionInfo.GetVersionInfo(exePath);
 
                 foreach (var f in (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation))) {
+                    if (f == ShortcutLocation.None) continue;
                     if (!locations.HasFlag(f)) continue;
 
                     var file = linkTargetForVersionInfo(f, zf, fileVerInfo);
@@ -161,6 +162,7 @@ public void RemoveShortcutsForExecutable(string exeName, ShortcutLocation locati
                     Path.Combine(Utility.AppDirForRelease(rootAppDirectory, thisRelease), exeName));
 
                 foreach (var f in (ShortcutLocation[]) Enum.GetValues(typeof(ShortcutLocation))) {
+                    if (f == ShortcutLocation.None) continue;
                     if (!locations.HasFlag(f)) continue;
 
                     var file = linkTargetForVersionInfo(f, zf, fileVerInfo);

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -78,6 +78,7 @@ int main(string[] args)
                 string processStartArgs = default(string);
                 string appName = default(string);
                 string setupIcon = default(string);
+                string shortcutArgs = default(string);
 
                 opts = new OptionSet() {
                     "Usage: Squirrel.exe command [OPTS]",
@@ -105,6 +106,7 @@ int main(string[] args)
                     { "s|silent", "Silent install", _ => silentInstall = true},
                     { "b=|baseUrl=", "Provides a base URL to prefix the RELEASES file packages with", v => baseUrl = v, true},
                     { "a=|process-start-args=", "Arguments that will be used when starting executable", v => processStartArgs = v, true},
+                    { "l=|shortcut-locations=", "Comma-separated string of shortcut locations, e.g. 'Desktop,StartMenu'", v => shortcutArgs = v},
                 };
 
                 opts.Parse(args);
@@ -138,10 +140,10 @@ int main(string[] args)
                     Releasify(target, releaseDir, packagesDir, bootstrapperExe, backgroundGif, signingParameters, baseUrl, setupIcon);
                     break;
                 case UpdateAction.Shortcut:
-                    Shortcut(target);
+                    Shortcut(target, shortcutArgs);
                     break;
                 case UpdateAction.Deshortcut:
-                    Deshortcut(target);
+                    Deshortcut(target, shortcutArgs);
                     break;
                 case UpdateAction.ProcessStart:
                     ProcessStart(processStart, processStartArgs);
@@ -391,29 +393,37 @@ public void Releasify(string package, string targetDir = null, string packagesDi
 
         }
 
-        public void Shortcut(string exeName)
+        public void Shortcut(string exeName, string shortcutArgs)
         {
             if (String.IsNullOrWhiteSpace(exeName)) {
                 ShowHelp();
                 return;
             }
 
             var appName = getAppNameFromDirectory();
+            var locations = String.IsNullOrWhiteSpace(shortcutArgs) 
+                ? ShortcutLocation.StartMenu | ShortcutLocation.Desktop
+                : parseShortcutLocations(shortcutArgs);
+
             using (var mgr = new UpdateManager("", appName, FrameworkVersion.Net45)) {
-                mgr.CreateShortcutsForExecutable(exeName, ShortcutLocation.Desktop | ShortcutLocation.StartMenu, false);
+                mgr.CreateShortcutsForExecutable(exeName, locations, false);
             }
         }
 
-        public void Deshortcut(string exeName)
+        public void Deshortcut(string exeName, string shortcutArgs)
         {
             if (String.IsNullOrWhiteSpace(exeName)) {
                 ShowHelp();
                 return;
             }
 
             var appName = getAppNameFromDirectory();
+            var locations = String.IsNullOrWhiteSpace(shortcutArgs)
+                ? ShortcutLocation.StartMenu | ShortcutLocation.Desktop
+                : parseShortcutLocations(shortcutArgs);
+
             using (var mgr = new UpdateManager("", appName, FrameworkVersion.Net45)) {
-                mgr.RemoveShortcutsForExecutable(exeName, ShortcutLocation.Desktop | ShortcutLocation.StartMenu);
+                mgr.RemoveShortcutsForExecutable(exeName, locations);
             }
         }
 
@@ -594,6 +604,19 @@ static string getAppNameFromDirectory(string path = null)
             return (new DirectoryInfo(path)).Name;
         }
 
+        static ShortcutLocation parseShortcutLocations(string shortcutArgs)
+        {
+            var locations = ShortcutLocation.None;
+            var args = shortcutArgs.Split(new[] { ',' });
+
+            foreach (var arg in args) {
+                var location = (ShortcutLocation)(Enum.Parse(typeof(ShortcutLocation), arg, false));
+                locations |= location;
+            }
+
+            return locations;
+        }
+
         static int consoleCreated = 0;
         static void ensureConsole()
         {