From 75702baa6806b53f032bd6e71e987ee2a91dab28 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Tue, 9 Mar 2021 23:15:35 +0100
Subject: [PATCH] restruct

---
 scripts/autoconfig-all.cmd                  |   2 +-
 scripts/{links => desktop}/Terminal.lnk     | Bin
 scripts/install-desktoplinks.cmd            |  12 ------------
 scripts/install-shortcuts.cmd               |  15 +++++++++++++++
 scripts/install-vlc.cmd                     |   5 ++---
 scripts/{links => startmenu}/CMD.lnk        | Bin
 scripts/{links => startmenu}/PowerShell.lnk | Bin
 scripts/{links => startmenu}/RDP.lnk        | Bin
 scripts/{links => startmenu}/VNC.lnk        | Bin
 9 files changed, 18 insertions(+), 16 deletions(-)
 rename scripts/{links => desktop}/Terminal.lnk (100%)
 delete mode 100644 scripts/install-desktoplinks.cmd
 create mode 100644 scripts/install-shortcuts.cmd
 rename scripts/{links => startmenu}/CMD.lnk (100%)
 rename scripts/{links => startmenu}/PowerShell.lnk (100%)
 rename scripts/{links => startmenu}/RDP.lnk (100%)
 rename scripts/{links => startmenu}/VNC.lnk (100%)

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 6017125..73b0283 100644
--- a/scripts/autoconfig-all.cmd
+++ b/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 ...
diff --git a/scripts/links/Terminal.lnk b/scripts/desktop/Terminal.lnk
similarity index 100%
rename from scripts/links/Terminal.lnk
rename to scripts/desktop/Terminal.lnk
diff --git a/scripts/install-desktoplinks.cmd b/scripts/install-desktoplinks.cmd
deleted file mode 100644
index 7eeb496..0000000
--- a/scripts/install-desktoplinks.cmd
+++ /dev/null
@@ -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 #######
-
diff --git a/scripts/install-shortcuts.cmd b/scripts/install-shortcuts.cmd
new file mode 100644
index 0000000..3ca41c7
--- /dev/null
+++ b/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 #######
+
diff --git a/scripts/install-vlc.cmd b/scripts/install-vlc.cmd
index b8a3332..ca96c22 100644
--- a/scripts/install-vlc.cmd
+++ b/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
diff --git a/scripts/links/CMD.lnk b/scripts/startmenu/CMD.lnk
similarity index 100%
rename from scripts/links/CMD.lnk
rename to scripts/startmenu/CMD.lnk
diff --git a/scripts/links/PowerShell.lnk b/scripts/startmenu/PowerShell.lnk
similarity index 100%
rename from scripts/links/PowerShell.lnk
rename to scripts/startmenu/PowerShell.lnk
diff --git a/scripts/links/RDP.lnk b/scripts/startmenu/RDP.lnk
similarity index 100%
rename from scripts/links/RDP.lnk
rename to scripts/startmenu/RDP.lnk
diff --git a/scripts/links/VNC.lnk b/scripts/startmenu/VNC.lnk
similarity index 100%
rename from scripts/links/VNC.lnk
rename to scripts/startmenu/VNC.lnk