restruct

scripts/autoconfig-all.cmd

@@ -128,7 +128,7 @@ echo.
 call install-vlc.cmd
 echo.
 
-call install-desktoplinks.cmd
+call install-shortcuts.cmd
 echo.
 
 rem should be done as late as possible ...

scripts/install-desktoplinks.cmd

@@ -1,12 +0,0 @@
-@echo off
-
-set SOURCE=links
-set TARGET="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-echo ####### %0 #######
-
-echo copying desktop icons ...
-xcopy /CDI /HERBY %SOURCE% %TARGET%
-
-echo ####### %0 #######
-

scripts/install-shortcuts.cmd

@@ -0,0 +1,15 @@
+@echo off
+
+set DESKTOP="%PUBLIC%\Desktop"
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+echo ####### %0 #######
+
+echo copying desktop shortcuts ...
+xcopy /CDI /HERBY desktop %DESKTOP%
+
+echo copying startmenu shortcuts ...
+xcopy /CDI /HERBY startmenu %STARTMENU%
+
+echo ####### %0 #######
+

scripts/install-vlc.cmd

@@ -12,9 +12,8 @@ echo ####### %0 #######
 echo installing VLC player ...
 %EXE% /L=1033 /S
 
-echo renaming Desktop shortcut ...
-move /Y "%PUBLIC%\Desktop\VLC media player.lnk" ^
-  "%PUBLIC%\Desktop\VLC.lnk"
+echo removing Desktop link ...
+del /F "%PUBLIC%\Desktop\VLC media player.lnk" 2>nul
 
 rem refresh desktop (W10 style)
 ie4uinit.exe -show