Some more tweaks

niheaven · niheaven · commit 79086e6b0bc9 · 2022-06-21T14:09:04.000+08:00
diff --git a/lib/shortcuts.ps1 b/lib/shortcuts.ps1
@@ -20,9 +20,12 @@ function create_startmenu_shortcuts($manifest, $dir, $global, $arch) {
 }
 
 function shortcut_folder($global) {
-    $directory = 'startmenu'
-    if ($global) { $directory = "common$directory" }
-    return Convert-Path $(ensure [System.IO.Path]::Combine([Environment]::GetFolderPath($directory), 'Programs', 'Scoop Apps'))
+    if ($global) {
+        $startmenu = 'CommonStartMenu'
+    } else {
+        $startmenu = 'StartMenu'
+    }
+    return Convert-Path $(ensure [System.IO.Path]::Combine([Environment]::GetFolderPath($startmenu), 'Programs', 'Scoop Apps'))
 }
 
 function startmenu_shortcut([System.IO.FileInfo] $target, $shortcutName, $arguments, [System.IO.FileInfo]$icon, $global) {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,12 @@ function create_startmenu_shortcuts($manifest, $dir, $global, $arch) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`function shortcut_folder($global) {`
`23`		`- $directory = 'startmenu'`
`24`		`- if ($global) { $directory = "common$directory" }`
`25`		`- return Convert-Path $(ensure [System.IO.Path]::Combine([Environment]::GetFolderPath($directory), 'Programs', 'Scoop Apps'))`
	`23`	`+ if ($global) {`
	`24`	`+ $startmenu = 'CommonStartMenu'`
	`25`	`+ } else {`
	`26`	`+ $startmenu = 'StartMenu'`
	`27`	`+ }`
	`28`	`+ return Convert-Path $(ensure [System.IO.Path]::Combine([Environment]::GetFolderPath($startmenu), 'Programs', 'Scoop Apps'))`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`function startmenu_shortcut([System.IO.FileInfo] $target, $shortcutName, $arguments, [System.IO.FileInfo]$icon, $global) {`