From a7a4d5853ac45eeab6c5ca0d531fe078d8f5427e Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sat, 13 Feb 2021 10:46:20 +0100
Subject: [PATCH] .

---
 CustomSetup.cmd              |  5 +++--
 scripts/autoconfig-all.cmd   |  2 +-
 scripts/install-emclient.cmd |  4 ++++
 scripts/install-gsync.cmd    | 31 -------------------------------
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 scripts/install-gsync.cmd

diff --git a/CustomSetup.cmd b/CustomSetup.cmd
index b06f886..844b72f 100644
--- a/CustomSetup.cmd
+++ b/CustomSetup.cmd
@@ -2,6 +2,7 @@
 rem this script puts everything in place ...
 
 set TOOLS=c:\tools
+set SOFTWARE=%TOOLS%\software
 set SCRIPTS=%TOOLS%\scripts
 set BATCH=%SCRIPTS%\autoconfig-all.cmd
 set LOG=c:\CustomSetup.txt
@@ -55,8 +56,8 @@ del /F %TOOLS%\ImapCopy.zip 1>nul 2>nul
 echo.
 
 echo unpacking MediaCreationTool ...
-%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\MediaCreationTool20H2.zip
-del /F %TOOLS%\MediaCreationTool20H2.zip 1>nul 2>nul
+%TOOLS%\7z x -aoa -o%SOFTWARE% %SOFTWARE%\MediaCreationTool20H2.zip
+del /F %SOFTWARE%\MediaCreationTool20H2.zip 1>nul 2>nul
 echo.
 
 echo starting %BATCH% ...
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index f1003f6..cebd9aa 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -112,7 +112,7 @@ echo.
 call install-softmaker.cmd
 echo.
 
-call install-gsync.cmd
+call install-googledrive.cmd
 echo.
 
 call install-receiver.cmd
diff --git a/scripts/install-emclient.cmd b/scripts/install-emclient.cmd
index 18927d8..79879ba 100644
--- a/scripts/install-emclient.cmd
+++ b/scripts/install-emclient.cmd
@@ -13,8 +13,12 @@ msiexec /i %MSI% /quiet
 @echo off
 cd %SCRIPTS%
 
+rem create icon on desktop ...
 copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\eM Client.lnk" ^
   %PUBLIC%\Desktop
 
+rem remove autostart for em-Client ...
+reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "eM Client" /f
+
 echo ####### %0 #######
 
diff --git a/scripts/install-gsync.cmd b/scripts/install-gsync.cmd
deleted file mode 100644
index 8848734..0000000
--- a/scripts/install-gsync.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-
-set SCRIPTS=..\scripts
-set SOFTWARE=..\software
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-set MSI=gsync_enterprise64.msi 
-
-echo ####### %0 #######
-
-cd %SOFTWARE%
-@echo on
-msiexec /i %MSI% /qn 
-@echo off
-cd %SCRIPTS%
-
-echo changing startmenu folder ...
-move /Y %STARTMENU%\"Backup and Sync from Google\Backup and Sync from Google.lnk" ^
-  %STARTMENU%\"Backup and Sync.lnk" 1>nul 2>nul
-
-echo removing gsync startmenu folder ...
-rd /S /Q %STARTMENU%\"Backup and Sync from Google"
-
-echo removing google desktop icons ...
-del /F /Q %PUBLIC%\Desktop\Google*
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-