From 4829e210e983b71773a21a9aa98f9e9e98130f9d Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 7 Oct 2025 18:25:38 +0300 Subject: [PATCH] big migration to csv started --- README.md | 2 +- data/apps/[all]/AIMP.bat | 27 ++ data/apps/[all]/apps.csv | 5 + .../[archive]/64Gram.bat | 0 data/apps/[archive]/EqualizerAPO.bat | 12 + .../[all] => apps/[archive]}/KeePassXC.bat | 24 +- .../[archive]/Nekoray.bat | 0 .../[all] => apps/[archive]}/Playnite.bat | 22 +- .../[all] => apps/[archive]}/Powertoys.bat | 24 +- .../[archive]/PrismLauncher.bat | 0 .../[all] => apps/[archive]}/Sublime Text.bat | 28 +- .../[all] => apps/[archive]}/SumatraPDF.bat | 24 +- .../[all] => apps/[archive]}/Syncthing.bat | 24 +- .../[all] => apps/[archive]}/Transmission.bat | 24 +- .../[all] => apps/[archive]}/VSCodium.bat | 0 .../[archive]/beets.bat | 0 .../[archive]/glzr.bat | 24 +- .../[all] => apps/[archive]}/gramps.bat | 24 +- .../[archive]/hfdownloader.bat | 0 .../[all] => apps/[archive]}/ludusavi.bat | 24 +- .../[all] => apps/[archive]}/v2rayN.bat | 0 data/apps/legacy/EqualizerAPO copy.bat | 12 + data/configurations/[all]/AIMP.bat | 13 - data/configurations/[all]/EqualizerAPO.bat | 17 - data/packages/VETYMAE-FUTURE/choco.config | 5 - data/packages/VETYMAE-FUTURE/msstore.json | 24 -- data/packages/VETYMAE-FUTURE/winget.json | 96 ------ data/packages/install.bat | 34 -- data/packages/lamet/choco.config | 29 -- data/packages/lamet/msstore.json | 5 - data/packages/lamet/winget.json | 200 ------------ data/packages/vetymae/choco.config | 33 -- data/packages/vetymae/choco.config.backup | 33 -- data/packages/vetymae/msstore.json | 44 --- data/packages/vetymae/winget.json | 302 ------------------ deploy.bat | 5 +- modules/apps-connect.bat | 11 + modules/apps-disconnect.bat | 11 + modules/apps-manager.bat | 95 ++++++ modules/apps-reconnect.bat | 11 + modules/configurations.bat | 15 - modules/export-lists.bat | 24 -- modules/{mounts.bat => mounts-connect.bat} | 20 +- modules/packages.bat | 17 - modules/storage-disconnect.bat | 15 + modules/storage-reconnect.bat | 15 + settings/chocolatey.ps1 | 2 - settings/pin-list.bat | 11 - settings/scoop.ps1 | 3 - settings/vars.bat | 13 +- 50 files changed, 354 insertions(+), 1049 deletions(-) create mode 100644 data/apps/[all]/AIMP.bat create mode 100644 data/apps/[all]/apps.csv rename data/{configurations => apps}/[archive]/64Gram.bat (100%) create mode 100644 data/apps/[archive]/EqualizerAPO.bat rename data/{configurations/[all] => apps/[archive]}/KeePassXC.bat (92%) rename data/{configurations => apps}/[archive]/Nekoray.bat (100%) rename data/{configurations/[all] => apps/[archive]}/Playnite.bat (93%) rename data/{configurations/[all] => apps/[archive]}/Powertoys.bat (93%) rename data/{configurations => apps}/[archive]/PrismLauncher.bat (100%) rename data/{configurations/[all] => apps/[archive]}/Sublime Text.bat (95%) rename data/{configurations/[all] => apps/[archive]}/SumatraPDF.bat (92%) rename data/{configurations/[all] => apps/[archive]}/Syncthing.bat (93%) rename data/{configurations/[all] => apps/[archive]}/Transmission.bat (93%) rename data/{configurations/[all] => apps/[archive]}/VSCodium.bat (100%) rename data/{configurations => apps}/[archive]/beets.bat (100%) rename data/{configurations => apps}/[archive]/glzr.bat (92%) rename data/{configurations/[all] => apps/[archive]}/gramps.bat (92%) rename data/{configurations => apps}/[archive]/hfdownloader.bat (100%) rename data/{configurations/[all] => apps/[archive]}/ludusavi.bat (92%) rename data/{configurations/[all] => apps/[archive]}/v2rayN.bat (100%) create mode 100644 data/apps/legacy/EqualizerAPO copy.bat delete mode 100644 data/configurations/[all]/AIMP.bat delete mode 100644 data/configurations/[all]/EqualizerAPO.bat delete mode 100644 data/packages/VETYMAE-FUTURE/choco.config delete mode 100644 data/packages/VETYMAE-FUTURE/msstore.json delete mode 100644 data/packages/VETYMAE-FUTURE/winget.json delete mode 100644 data/packages/install.bat delete mode 100644 data/packages/lamet/choco.config delete mode 100644 data/packages/lamet/msstore.json delete mode 100644 data/packages/lamet/winget.json delete mode 100644 data/packages/vetymae/choco.config delete mode 100644 data/packages/vetymae/choco.config.backup delete mode 100644 data/packages/vetymae/msstore.json delete mode 100644 data/packages/vetymae/winget.json create mode 100644 modules/apps-connect.bat create mode 100644 modules/apps-disconnect.bat create mode 100644 modules/apps-manager.bat create mode 100644 modules/apps-reconnect.bat delete mode 100644 modules/configurations.bat delete mode 100644 modules/export-lists.bat rename modules/{mounts.bat => mounts-connect.bat} (93%) delete mode 100644 modules/packages.bat create mode 100644 modules/storage-disconnect.bat create mode 100644 modules/storage-reconnect.bat delete mode 100644 settings/chocolatey.ps1 delete mode 100644 settings/pin-list.bat delete mode 100644 settings/scoop.ps1 diff --git a/README.md b/README.md index 9a2aa88..64d29ef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ It's just a simple deployment. You may need it for something more. **Portable programs often have their disadvantages, which symlinks can fix**. Try to make this something more automated so you don't have to use your mouse again to install packages on Windows. -*Configurations are restored individually, I made them for myself, keep in mind! Everything written here may be a very **unprepared solution** for you!* +*Apps configurations are restored individually, I made them for myself, keep in mind! Everything written here may be a very **unprepared solution** for you!* # What it all does diff --git a/data/apps/[all]/AIMP.bat b/data/apps/[all]/AIMP.bat new file mode 100644 index 0000000..2880ecb --- /dev/null +++ b/data/apps/[all]/AIMP.bat @@ -0,0 +1,27 @@ +@echo off +setlocal + +set "app=AIMP" + +set "from_1=%storage%\%app%" +set "to_1=%appdata%\%app%" + +if "%1"=="" goto reconnect +if /I "%1"=="disconnect" goto disconnect +if /I "%1"=="connect" goto connect + +:disconnect +rd /Q "%to_1%" +goto end + +:connect +mklink /D "%to_1%" "%from_1%" +goto end + +:reconnect +rd /Q "%to_1%" +mklink /D "%to_1%" "%from_1%" +goto end + +:end +endlocal \ No newline at end of file diff --git a/data/apps/[all]/apps.csv b/data/apps/[all]/apps.csv new file mode 100644 index 0000000..ce50ea4 --- /dev/null +++ b/data/apps/[all]/apps.csv @@ -0,0 +1,5 @@ +App,From,To,Type,Enabled,Extra-Variables,Extra-Connect,Extra-Disconnect +AIMP,%storage%\%app%,%appdata%\%app%,default,0,,, +KeePassXC,%storage%\%app%,%appdata%\%app%,default,0,,, +gramps,%storage%\%app%,%appdata%\%app%,default,0,,, +EqualizerAPO,%storage%\%app%,%ProgramFiles%\%app%,isolate,1,"set ""from_1=%storage%\%app%"" && set ""to_1=%ProgramFiles%\%app%"" && set ""FabFilter_Pro-Q_3=%ProgramFiles%\VSTPlugins\FabFilter\FabFilter Pro-Q 3.dll""","reg add ""HKEY_LOCAL_MACHINE\SOFTWARE\EqualizerAPO"" /v ""ConfigPath"" /t REG_SZ /d ""%storage%\%app%"" /f && mklink ""%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll"" ""%FabFilter_Pro-Q_3%""","for /f ""delims="" %%i in ('dir /aL /b %to_1%\config') do del ""%%i"" && del /q ""%to_1%\config\*"" && del /q ""%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll""" \ No newline at end of file diff --git a/data/configurations/[archive]/64Gram.bat b/data/apps/[archive]/64Gram.bat similarity index 100% rename from data/configurations/[archive]/64Gram.bat rename to data/apps/[archive]/64Gram.bat diff --git a/data/apps/[archive]/EqualizerAPO.bat b/data/apps/[archive]/EqualizerAPO.bat new file mode 100644 index 0000000..f40c5f6 --- /dev/null +++ b/data/apps/[archive]/EqualizerAPO.bat @@ -0,0 +1,12 @@ +@echo off +setlocal + +set "app=EqualizerAPO" + +set "from_1=%storage%\%app%" && set "to_1=%ProgramFiles%\%app%" && set "FabFilter_Pro-Q_3=%ProgramFiles%\VSTPlugins\FabFilter\FabFilter Pro-Q 3.dll" + +for /f "delims=" %%i in ('dir /aL /b %to_1%\config') do del "%%i" && del /q "%to_1%\config\*" && del /q "%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll" + +reg add "HKEY_LOCAL_MACHINE\SOFTWARE\EqualizerAPO" /v "ConfigPath" /t REG_SZ /d "%storage%\%app%" /f && mklink "%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll" "%FabFilter_Pro-Q_3%" + +endlocal diff --git a/data/configurations/[all]/KeePassXC.bat b/data/apps/[archive]/KeePassXC.bat similarity index 92% rename from data/configurations/[all]/KeePassXC.bat rename to data/apps/[archive]/KeePassXC.bat index 440e068..3ba5bb2 100644 --- a/data/configurations/[all]/KeePassXC.bat +++ b/data/apps/[archive]/KeePassXC.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=KeePassXC" - -set "from_1=%storage%\%app%" -set "to_1=%appdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=KeePassXC" + +set "from_1=%storage%\%app%" +set "to_1=%appdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[archive]/Nekoray.bat b/data/apps/[archive]/Nekoray.bat similarity index 100% rename from data/configurations/[archive]/Nekoray.bat rename to data/apps/[archive]/Nekoray.bat diff --git a/data/configurations/[all]/Playnite.bat b/data/apps/[archive]/Playnite.bat similarity index 93% rename from data/configurations/[all]/Playnite.bat rename to data/apps/[archive]/Playnite.bat index a8a1265..37faf83 100644 --- a/data/configurations/[all]/Playnite.bat +++ b/data/apps/[archive]/Playnite.bat @@ -1,12 +1,12 @@ -@echo off -setlocal - -set "app=Playnite" - -set "from_1=%storage%\%app%" -set "to_1=%appdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" +@echo off +setlocal + +set "app=Playnite" + +set "from_1=%storage%\%app%" +set "to_1=%appdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" endlocal \ No newline at end of file diff --git a/data/configurations/[all]/Powertoys.bat b/data/apps/[archive]/Powertoys.bat similarity index 93% rename from data/configurations/[all]/Powertoys.bat rename to data/apps/[archive]/Powertoys.bat index ca88d09..1b4d09e 100644 --- a/data/configurations/[all]/Powertoys.bat +++ b/data/apps/[archive]/Powertoys.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=Powertoys" - -set "from_1=%storage%\%app%\%computername%" -set "to_1=%localappdata%\Microsoft\PowerToys" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=Powertoys" + +set "from_1=%storage%\%app%\%computername%" +set "to_1=%localappdata%\Microsoft\PowerToys" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[archive]/PrismLauncher.bat b/data/apps/[archive]/PrismLauncher.bat similarity index 100% rename from data/configurations/[archive]/PrismLauncher.bat rename to data/apps/[archive]/PrismLauncher.bat diff --git a/data/configurations/[all]/Sublime Text.bat b/data/apps/[archive]/Sublime Text.bat similarity index 95% rename from data/configurations/[all]/Sublime Text.bat rename to data/apps/[archive]/Sublime Text.bat index 353dbcb..282cc64 100644 --- a/data/configurations/[all]/Sublime Text.bat +++ b/data/apps/[archive]/Sublime Text.bat @@ -1,15 +1,15 @@ -@echo off -setlocal - -set "app=Sublime Text" - -set "from_1=%storage%\%app%\Config" -set "to_1=%AppData%\%app%" -set "from_exe_1=%storage%\%app%\Patched\Windows\sublime_text.exe" -set "to_exe_1=%ProgramFiles%\%app%\sublime_text.exe" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=Sublime Text" + +set "from_1=%storage%\%app%\Config" +set "to_1=%AppData%\%app%" +set "from_exe_1=%storage%\%app%\Patched\Windows\sublime_text.exe" +set "to_exe_1=%ProgramFiles%\%app%\sublime_text.exe" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/SumatraPDF.bat b/data/apps/[archive]/SumatraPDF.bat similarity index 92% rename from data/configurations/[all]/SumatraPDF.bat rename to data/apps/[archive]/SumatraPDF.bat index b226c1d..24d075e 100644 --- a/data/configurations/[all]/SumatraPDF.bat +++ b/data/apps/[archive]/SumatraPDF.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=SumatraPDF" - -set "from_1=%storage%\%app%" -set "to_1=%localappdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=SumatraPDF" + +set "from_1=%storage%\%app%" +set "to_1=%localappdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/Syncthing.bat b/data/apps/[archive]/Syncthing.bat similarity index 93% rename from data/configurations/[all]/Syncthing.bat rename to data/apps/[archive]/Syncthing.bat index 279142d..f22fd56 100644 --- a/data/configurations/[all]/Syncthing.bat +++ b/data/apps/[archive]/Syncthing.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=Syncthing" - -set "from_1=%storage%\%app%\%computername%" -set "to_1=%localappdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=Syncthing" + +set "from_1=%storage%\%app%\%computername%" +set "to_1=%localappdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/Transmission.bat b/data/apps/[archive]/Transmission.bat similarity index 93% rename from data/configurations/[all]/Transmission.bat rename to data/apps/[archive]/Transmission.bat index 60ddc3a..621a412 100644 --- a/data/configurations/[all]/Transmission.bat +++ b/data/apps/[archive]/Transmission.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=transmission" - -set "from_1=%storage%\%app%\%computername%" -set "to_1=%localappdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=transmission" + +set "from_1=%storage%\%app%\%computername%" +set "to_1=%localappdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/VSCodium.bat b/data/apps/[archive]/VSCodium.bat similarity index 100% rename from data/configurations/[all]/VSCodium.bat rename to data/apps/[archive]/VSCodium.bat diff --git a/data/configurations/[archive]/beets.bat b/data/apps/[archive]/beets.bat similarity index 100% rename from data/configurations/[archive]/beets.bat rename to data/apps/[archive]/beets.bat diff --git a/data/configurations/[archive]/glzr.bat b/data/apps/[archive]/glzr.bat similarity index 92% rename from data/configurations/[archive]/glzr.bat rename to data/apps/[archive]/glzr.bat index ded2b5d..371a1a0 100644 --- a/data/configurations/[archive]/glzr.bat +++ b/data/apps/[archive]/glzr.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=glzr" - -set "from_1=%storage%\%app%" -set "to_1=%USERPROFILE%\.%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=glzr" + +set "from_1=%storage%\%app%" +set "to_1=%USERPROFILE%\.%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/gramps.bat b/data/apps/[archive]/gramps.bat similarity index 92% rename from data/configurations/[all]/gramps.bat rename to data/apps/[archive]/gramps.bat index a1fa8b4..e5fc831 100644 --- a/data/configurations/[all]/gramps.bat +++ b/data/apps/[archive]/gramps.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=gramps" - -set "from_1=%storage%\%app%" -set "to_1=%appdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=gramps" + +set "from_1=%storage%\%app%" +set "to_1=%appdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[archive]/hfdownloader.bat b/data/apps/[archive]/hfdownloader.bat similarity index 100% rename from data/configurations/[archive]/hfdownloader.bat rename to data/apps/[archive]/hfdownloader.bat diff --git a/data/configurations/[all]/ludusavi.bat b/data/apps/[archive]/ludusavi.bat similarity index 92% rename from data/configurations/[all]/ludusavi.bat rename to data/apps/[archive]/ludusavi.bat index 11dbcf2..c494802 100644 --- a/data/configurations/[all]/ludusavi.bat +++ b/data/apps/[archive]/ludusavi.bat @@ -1,13 +1,13 @@ -@echo off -setlocal - -set "app=ludusavi" - -set "from_1=%storage%\%app%\cfg" -set "to_1=%appdata%\%app%" - -rd /q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - +@echo off +setlocal + +set "app=ludusavi" + +set "from_1=%storage%\%app%\cfg" +set "to_1=%appdata%\%app%" + +rd /q "%to_1%" + +mklink /D "%to_1%" "%from_1%" + endlocal \ No newline at end of file diff --git a/data/configurations/[all]/v2rayN.bat b/data/apps/[archive]/v2rayN.bat similarity index 100% rename from data/configurations/[all]/v2rayN.bat rename to data/apps/[archive]/v2rayN.bat diff --git a/data/apps/legacy/EqualizerAPO copy.bat b/data/apps/legacy/EqualizerAPO copy.bat new file mode 100644 index 0000000..12ebaea --- /dev/null +++ b/data/apps/legacy/EqualizerAPO copy.bat @@ -0,0 +1,12 @@ +@echo off +setlocal + +set "app=EqualizerAPO" + +set "from_1=%storage%\%App%" && set "to_1=%ProgramFiles%\%App%" && set "FabFilter Pro-Q 3=%ProgramFiles%\VSTPlugins\FabFilter\FabFilter Pro-Q 3.dll" + +for /f "delims=" %%i in ('dir /aL /b %To%\config') do del "%%i" && del /q "%To%\config\*" && del /q "%To%\VSTPlugins\FabFilter Pro-Q 3.dll" + +reg add "HKEY_LOCAL_MACHINE\SOFTWARE\EqualizerAPO" /v "ConfigPath" /t REG_SZ /d "%storage%\%App%" /f && mklink "%To%\VSTPlugins\FabFilter Pro-Q 3.dll" "%FabFilter Pro-Q 3%" + +endlocal diff --git a/data/configurations/[all]/AIMP.bat b/data/configurations/[all]/AIMP.bat deleted file mode 100644 index 8b4c297..0000000 --- a/data/configurations/[all]/AIMP.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -setlocal - -set "app=AIMP" - -set "from_1=%storage%\%app%" -set "to_1=%appdata%\%app%" - -rd /S /Q "%to_1%" - -mklink /D "%to_1%" "%from_1%" - -endlocal \ No newline at end of file diff --git a/data/configurations/[all]/EqualizerAPO.bat b/data/configurations/[all]/EqualizerAPO.bat deleted file mode 100644 index b367a9f..0000000 --- a/data/configurations/[all]/EqualizerAPO.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -setlocal - -set "app=EqualizerAPO" - -set "from_1=%storage%\%app%" -set "to_1=%ProgramFiles%\%app%" -set "FabFilter Pro-Q 3=%ProgramFiles%\VSTPlugins\FabFilter\FabFilter Pro-Q 3.dll" - -for /f "delims=" %%i in ('dir /aL /b %to_1%\config') do del "%%i" -del /q "%to_1%\config\*" -del /q "%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll" - -reg add "HKEY_LOCAL_MACHINE\SOFTWARE\EqualizerAPO" /v "ConfigPath" /t REG_SZ /d "%storage%\%app%" /f -mklink "%to_1%\VSTPlugins\FabFilter Pro-Q 3.dll" "%FabFilter Pro-Q 3%" - -endlocal diff --git a/data/packages/VETYMAE-FUTURE/choco.config b/data/packages/VETYMAE-FUTURE/choco.config deleted file mode 100644 index bf60a2a..0000000 --- a/data/packages/VETYMAE-FUTURE/choco.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/data/packages/VETYMAE-FUTURE/msstore.json b/data/packages/VETYMAE-FUTURE/msstore.json deleted file mode 100644 index 8c0365a..0000000 --- a/data/packages/VETYMAE-FUTURE/msstore.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-04-02T17:29:28.568-00:00", - "Sources" : - [ - { - "Packages" : - [ - { - "PackageIdentifier" : "XP89BSK82W9J28", - "Version" : "1.06.0036" - } - ], - "SourceDetails" : - { - "Argument" : "https://storeedgefd.dsx.mp.microsoft.com/v9.0", - "Identifier" : "StoreEdgeFD", - "Name" : "msstore", - "Type" : "Microsoft.Rest" - } - } - ], - "WinGetVersion" : "1.10.340" -} \ No newline at end of file diff --git a/data/packages/VETYMAE-FUTURE/winget.json b/data/packages/VETYMAE-FUTURE/winget.json deleted file mode 100644 index da5dbf3..0000000 --- a/data/packages/VETYMAE-FUTURE/winget.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-04-02T17:29:34.089-00:00", - "Sources" : - [ - { - "Packages" : - [ - { - "PackageIdentifier" : "RARLab.WinRAR", - "Version" : "7.11.0" - }, - { - "PackageIdentifier" : "Audient.iD", - "Version" : "4.4.0.0" - }, - { - "PackageIdentifier" : "Romanitho.Winget-AutoUpdate", - "Version" : "2.3.1.1780" - }, - { - "PackageIdentifier" : "Nvidia.PhysX", - "Version" : "9.21.0713" - }, - { - "PackageIdentifier" : "Google.Chrome.EXE", - "Version" : "135.0.7049.42" - }, - { - "PackageIdentifier" : "Chocolatey.Chocolatey", - "Version" : "2.4.3.0" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.AspNetCore.8", - "Version" : "8.0.14" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.7", - "Version" : "7.0.20" - }, - { - "PackageIdentifier" : "RedHat.VirtIO", - "Version" : "0.1.266" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x64", - "Version" : "14.42.34438.0" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x86", - "Version" : "14.42.34438.0" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.8", - "Version" : "8.0.14" - }, - { - "PackageIdentifier" : "Brave.Brave", - "Version" : "134.1.76.82" - }, - { - "PackageIdentifier" : "Syncthing.Syncthing", - "Version" : "1.29.3" - }, - { - "PackageIdentifier" : "LocalSend.LocalSend", - "Version" : "1.17.0" - }, - { - "PackageIdentifier" : "Microsoft.AppInstaller", - "Version" : "1.25.340.0" - }, - { - "PackageIdentifier" : "Microsoft.UI.Xaml.2.8", - "Version" : "8.2501.31001.0" - }, - { - "PackageIdentifier" : "Microsoft.VCLibs.Desktop.14", - "Version" : "14.0.33728.0" - }, - { - "PackageIdentifier" : "Microsoft.WindowsTerminal", - "Version" : "1.22.10731.0" - } - ], - "SourceDetails" : - { - "Argument" : "https://cdn.winget.microsoft.com/cache", - "Identifier" : "Microsoft.Winget.Source_8wekyb3d8bbwe", - "Name" : "winget", - "Type" : "Microsoft.PreIndexed.Package" - } - } - ], - "WinGetVersion" : "1.10.340" -} \ No newline at end of file diff --git a/data/packages/install.bat b/data/packages/install.bat deleted file mode 100644 index bc345f6..0000000 --- a/data/packages/install.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo off -setlocal - -:Choco -choco feature enable allowGlobalConfirmation -choco install "%packages-user-lists%\choco.config" -y - -:Winget -winget import -i "%packages-user-lists%\msstore.json" --accept-package-agreements --accept-source-agreements -winget import -i "%packages-user-lists%\winget.json" --accept-package-agreements --accept-source-agreements - -:Pin-lists -call %pin-list% -call %packages-user-lists-other% - -for %%i in (%winget-pin-list%) do ( - echo Pinning %%i... - cmd /c winget pin add --id "%%i" -) -for %%i in (%choco-pin-list%) do ( - echo Pinning %%i... - cmd /c choco pin add --name="'%%i'" -) - -for %%i in (%winget-other-list%) do ( - echo Installing %%i... - cmd /c winget install "'%%i'" -) -for %%i in (%choco-other-list%) do ( - echo Installing %%i... - cmd /c choco install "'%%i'" -) - -endlocal \ No newline at end of file diff --git a/data/packages/lamet/choco.config b/data/packages/lamet/choco.config deleted file mode 100644 index 659e994..0000000 --- a/data/packages/lamet/choco.config +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/packages/lamet/msstore.json b/data/packages/lamet/msstore.json deleted file mode 100644 index 4da7474..0000000 --- a/data/packages/lamet/msstore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-07-04T15:51:40.482-00:00", - "WinGetVersion" : "1.11.400" -} \ No newline at end of file diff --git a/data/packages/lamet/winget.json b/data/packages/lamet/winget.json deleted file mode 100644 index d47019a..0000000 --- a/data/packages/lamet/winget.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-07-04T15:51:59.656-00:00", - "Sources" : - [ - { - "Packages" : - [ - { - "PackageIdentifier" : "AIMP.AIMP" - }, - { - "PackageIdentifier" : "Git.Git" - }, - { - "PackageIdentifier" : "rcmaehl.MSEdgeRedirect" - }, - { - "PackageIdentifier" : "SublimeHQ.SublimeText.4" - }, - { - "PackageIdentifier" : "Audient.iD" - }, - { - "PackageIdentifier" : "Apple.Bonjour" - }, - { - "PackageIdentifier" : "Transmission.Transmission" - }, - { - "PackageIdentifier" : "Logitech.OptionsPlus" - }, - { - "PackageIdentifier" : "PDFArranger.PDFArranger" - }, - { - "PackageIdentifier" : "Starship.Starship" - }, - { - "PackageIdentifier" : "GNU.MidnightCommander" - }, - { - "PackageIdentifier" : "valinet.ExplorerPatcher" - }, - { - "PackageIdentifier" : "TheDocumentFoundation.LibreOffice" - }, - { - "PackageIdentifier" : "KeePassXCTeam.KeePassXC" - }, - { - "PackageIdentifier" : "Microsoft.PowerShell" - }, - { - "PackageIdentifier" : "Microsoft.Edge" - }, - { - "PackageIdentifier" : "Valve.Steam" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x86" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2012.x86" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.Runtime.8" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.8" - }, - { - "PackageIdentifier" : "Python.Launcher" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2005.x86" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.9" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.Runtime.3_1" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.AspNetCore.8" - }, - { - "PackageIdentifier" : "Apple.AppleSoftwareUpdate" - }, - { - "PackageIdentifier" : "ClockworkMod.UniversalADBDriver" - }, - { - "PackageIdentifier" : "LesFerch.WinSetView" - }, - { - "PackageIdentifier" : "Intel.IntelDriverAndSupportAssistant" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2012.x64" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x64" - }, - { - "PackageIdentifier" : "Brave.Brave" - }, - { - "PackageIdentifier" : "Discord.Discord" - }, - { - "PackageIdentifier" : "Fastfetch-cli.Fastfetch" - }, - { - "PackageIdentifier" : "Google.PlatformTools" - }, - { - "PackageIdentifier" : "Gramps.Gramps" - }, - { - "PackageIdentifier" : "Gyan.FFmpeg" - }, - { - "PackageIdentifier" : "JesseDuffield.lazygit" - }, - { - "PackageIdentifier" : "MatsuriDayo.NekoRay" - }, - { - "PackageIdentifier" : "Microsoft.Sysinternals.Autoruns" - }, - { - "PackageIdentifier" : "Microsoft.Sysinternals.RegJump" - }, - { - "PackageIdentifier" : "Playnite.Playnite" - }, - { - "PackageIdentifier" : "RadolynLabs.AyuGramDesktop" - }, - { - "PackageIdentifier" : "SumatraPDF.SumatraPDF" - }, - { - "PackageIdentifier" : "Syncthing.Syncthing" - }, - { - "PackageIdentifier" : "ToastyX.CustomResolutionUtility" - }, - { - "PackageIdentifier" : "Ventoy.Ventoy" - }, - { - "PackageIdentifier" : "WsSolInfor.CrystalDiskInfo" - }, - { - "PackageIdentifier" : "Obsidian.Obsidian" - }, - { - "PackageIdentifier" : "mtkennerly.ludusavi" - }, - { - "PackageIdentifier" : "LocalSend.LocalSend" - }, - { - "PackageIdentifier" : "Python.Python.3.13" - }, - { - "PackageIdentifier" : "Microsoft.PowerToys" - }, - { - "PackageIdentifier" : "M2Team.NanaZip" - }, - { - "PackageIdentifier" : "Microsoft.AppInstaller" - }, - { - "PackageIdentifier" : "Microsoft.UI.Xaml.2.7" - }, - { - "PackageIdentifier" : "Microsoft.UI.Xaml.2.8" - }, - { - "PackageIdentifier" : "Microsoft.VCLibs.Desktop.14" - }, - { - "PackageIdentifier" : "Microsoft.WindowsTerminal" - } - ], - "SourceDetails" : - { - "Argument" : "https://cdn.winget.microsoft.com/cache", - "Identifier" : "Microsoft.Winget.Source_8wekyb3d8bbwe", - "Name" : "winget", - "Type" : "Microsoft.PreIndexed.Package" - } - } - ], - "WinGetVersion" : "1.11.400" -} \ No newline at end of file diff --git a/data/packages/vetymae/choco.config b/data/packages/vetymae/choco.config deleted file mode 100644 index 46bd85b..0000000 --- a/data/packages/vetymae/choco.config +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/packages/vetymae/choco.config.backup b/data/packages/vetymae/choco.config.backup deleted file mode 100644 index 0324894..0000000 --- a/data/packages/vetymae/choco.config.backup +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/packages/vetymae/msstore.json b/data/packages/vetymae/msstore.json deleted file mode 100644 index 57a4af4..0000000 --- a/data/packages/vetymae/msstore.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-07-04T15:31:49.842-00:00", - "Sources" : - [ - { - "Packages" : - [ - { - "PackageIdentifier" : "XPFFTQ037JWMHS" - }, - { - "PackageIdentifier" : "XP89DCGQ3K6VLD" - }, - { - "PackageIdentifier" : "9WZDNCRFJBH4" - }, - { - "PackageIdentifier" : "9WZDNCRFJ3PR" - }, - { - "PackageIdentifier" : "9WZDNCRFJBBG" - }, - { - "PackageIdentifier" : "9NMPJ99VJBWV" - }, - { - "PackageIdentifier" : "9WZDNCRFJ3PT" - }, - { - "PackageIdentifier" : "9WZDNCRFJ3P2" - } - ], - "SourceDetails" : - { - "Argument" : "https://storeedgefd.dsx.mp.microsoft.com/v9.0", - "Identifier" : "StoreEdgeFD", - "Name" : "msstore", - "Type" : "Microsoft.Rest" - } - } - ], - "WinGetVersion" : "1.11.400" -} \ No newline at end of file diff --git a/data/packages/vetymae/winget.json b/data/packages/vetymae/winget.json deleted file mode 100644 index e6ba2e8..0000000 --- a/data/packages/vetymae/winget.json +++ /dev/null @@ -1,302 +0,0 @@ -{ - "$schema" : "https://aka.ms/winget-packages.schema.2.0.json", - "CreationDate" : "2025-07-04T15:31:27.777-00:00", - "Sources" : - [ - { - "Packages" : - [ - { - "PackageIdentifier" : "AIMP.AIMP" - }, - { - "PackageIdentifier" : "CrystalDewWorld.CrystalDiskInfo" - }, - { - "PackageIdentifier" : "CrystalDewWorld.CrystalDiskMark" - }, - { - "PackageIdentifier" : "dechamps.FlexASIO" - }, - { - "PackageIdentifier" : "Git.Git" - }, - { - "PackageIdentifier" : "Resplendence.LatencyMon" - }, - { - "PackageIdentifier" : "rcmaehl.MSEdgeRedirect" - }, - { - "PackageIdentifier" : "Sonosaurus.SonoBus" - }, - { - "PackageIdentifier" : "PerfectWorld.TowerOfFantasy" - }, - { - "PackageIdentifier" : "SublimeHQ.SublimeText.4" - }, - { - "PackageIdentifier" : "VideoLAN.VLC" - }, - { - "PackageIdentifier" : "Audient.iD" - }, - { - "PackageIdentifier" : "Apple.BonjourPrintServices" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2010.x64" - }, - { - "PackageIdentifier" : "Geeks3D.FurMark.2" - }, - { - "PackageIdentifier" : "Zoom.Zoom" - }, - { - "PackageIdentifier" : "OwlPlug.OwlPlug" - }, - { - "PackageIdentifier" : "OpenJS.NodeJS" - }, - { - "PackageIdentifier" : "Apple.Bonjour" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2008.x64" - }, - { - "PackageIdentifier" : "Transmission.Transmission" - }, - { - "PackageIdentifier" : "Logitech.OptionsPlus" - }, - { - "PackageIdentifier" : "WinDirStat.WinDirStat" - }, - { - "PackageIdentifier" : "PDFArranger.PDFArranger" - }, - { - "PackageIdentifier" : "Nvidia.PhysX" - }, - { - "PackageIdentifier" : "Starship.Starship" - }, - { - "PackageIdentifier" : "JamesCJ60.Universalx86TuningUtility" - }, - { - "PackageIdentifier" : "TheDocumentFoundation.LibreOffice" - }, - { - "PackageIdentifier" : "KeePassXCTeam.KeePassXC" - }, - { - "PackageIdentifier" : "Microsoft.PowerShell" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2005.x86" - }, - { - "PackageIdentifier" : "MichaelTippach.ASIO4ALL" - }, - { - "PackageIdentifier" : "Guru3D.Afterburner" - }, - { - "PackageIdentifier" : "HandBrake.HandBrake" - }, - { - "PackageIdentifier" : "Microsoft.Edge" - }, - { - "PackageIdentifier" : "OBSProject.OBSStudio" - }, - { - "PackageIdentifier" : "Guru3D.RTSS" - }, - { - "PackageIdentifier" : "Valve.Steam" - }, - { - "PackageIdentifier" : "Chocolatey.Chocolatey" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2013.x64" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.AspNetCore.8" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.6" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x86" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.Runtime.7" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.8" - }, - { - "PackageIdentifier" : "Tailscale.Tailscale" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2012.x86" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.7" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.DesktopRuntime.9" - }, - { - "PackageIdentifier" : "Python.Launcher" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.AspNetCore.7" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.Runtime.3_1" - }, - { - "PackageIdentifier" : "TechPowerUp.GPU-Z" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2008.x86" - }, - { - "PackageIdentifier" : "Yarn.Yarn" - }, - { - "PackageIdentifier" : "Microsoft.DotNet.Runtime.6" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2013.x86" - }, - { - "PackageIdentifier" : "Apple.AppleSoftwareUpdate" - }, - { - "PackageIdentifier" : "ClockworkMod.UniversalADBDriver" - }, - { - "PackageIdentifier" : "LesFerch.WinSetView" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2010.x86" - }, - { - "PackageIdentifier" : "Nvidia.PhysXLegacy" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2012.x64" - }, - { - "PackageIdentifier" : "Microsoft.VCRedist.2015+.x64" - }, - { - "PackageIdentifier" : "Stretchly.Stretchly" - }, - { - "PackageIdentifier" : "Brave.Brave" - }, - { - "PackageIdentifier" : "Discord.Discord" - }, - { - "PackageIdentifier" : "OliverBetz.ExifTool" - }, - { - "PackageIdentifier" : "Fastfetch-cli.Fastfetch" - }, - { - "PackageIdentifier" : "GNU.Nano" - }, - { - "PackageIdentifier" : "Google.PlatformTools" - }, - { - "PackageIdentifier" : "Gramps.Gramps" - }, - { - "PackageIdentifier" : "JesseDuffield.lazygit" - }, - { - "PackageIdentifier" : "MatsuriDayo.NekoRay" - }, - { - "PackageIdentifier" : "Microsoft.Sysinternals.ProcessExplorer" - }, - { - "PackageIdentifier" : "Microsoft.Sysinternals.RegJump" - }, - { - "PackageIdentifier" : "OCBase.OCCT.Personal" - }, - { - "PackageIdentifier" : "Playnite.Playnite" - }, - { - "PackageIdentifier" : "RadolynLabs.AyuGramDesktop" - }, - { - "PackageIdentifier" : "SumatraPDF.SumatraPDF" - }, - { - "PackageIdentifier" : "Syncthing.Syncthing" - }, - { - "PackageIdentifier" : "Ventoy.Ventoy" - }, - { - "PackageIdentifier" : "ebkr.r2modman" - }, - { - "PackageIdentifier" : "Obsidian.Obsidian" - }, - { - "PackageIdentifier" : "ItchIo.Itch" - }, - { - "PackageIdentifier" : "mtkennerly.ludusavi" - }, - { - "PackageIdentifier" : "LocalSend.LocalSend" - }, - { - "PackageIdentifier" : "Python.Python.3.13" - }, - { - "PackageIdentifier" : "Microsoft.PowerToys" - }, - { - "PackageIdentifier" : "M2Team.NanaZip" - }, - { - "PackageIdentifier" : "Microsoft.AppInstaller" - }, - { - "PackageIdentifier" : "Microsoft.UI.Xaml.2.8" - }, - { - "PackageIdentifier" : "Microsoft.VCLibs.Desktop.14" - }, - { - "PackageIdentifier" : "Microsoft.WindowsTerminal" - } - ], - "SourceDetails" : - { - "Argument" : "https://cdn.winget.microsoft.com/cache", - "Identifier" : "Microsoft.Winget.Source_8wekyb3d8bbwe", - "Name" : "winget", - "Type" : "Microsoft.PreIndexed.Package" - } - } - ], - "WinGetVersion" : "1.11.400" -} \ No newline at end of file diff --git a/deploy.bat b/deploy.bat index 57419d7..0426bb8 100644 --- a/deploy.bat +++ b/deploy.bat @@ -27,6 +27,5 @@ if '%errorlevel%' NEQ '0' ( cd /d "%~dp0\modules" call init.bat -start call packages.bat -start call configurations.bat -start call mounts.bat \ No newline at end of file +start call storage-connect.bat +start call mounts-connect.bat \ No newline at end of file diff --git a/modules/apps-connect.bat b/modules/apps-connect.bat new file mode 100644 index 0000000..826dcdb --- /dev/null +++ b/modules/apps-connect.bat @@ -0,0 +1,11 @@ +@echo off +setlocal +>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" +if '%errorlevel%' NEQ '0' ( + echo Restarting as Admin... + powershell -Command "Start-Process -FilePath '%~dp0apps-manager.bat' -ArgumentList 'connect' -Verb RunAs" + exit /b +) + +call "%~dp0apps-manager.bat" connect +endlocal \ No newline at end of file diff --git a/modules/apps-disconnect.bat b/modules/apps-disconnect.bat new file mode 100644 index 0000000..00d08b3 --- /dev/null +++ b/modules/apps-disconnect.bat @@ -0,0 +1,11 @@ +@echo off +setlocal +>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" +if '%errorlevel%' NEQ '0' ( + echo Restarting as Admin... + powershell -Command "Start-Process -FilePath '%~dp0apps-manager.bat' -ArgumentList 'disconnect' -Verb RunAs" + exit /b +) + +call "%~dp0apps-manager.bat" disconnect +endlocal \ No newline at end of file diff --git a/modules/apps-manager.bat b/modules/apps-manager.bat new file mode 100644 index 0000000..7d23f5a --- /dev/null +++ b/modules/apps-manager.bat @@ -0,0 +1,95 @@ +@echo off +:: ========================================== +:: Проверка прав администратора +:: ========================================== +>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" +if '%errorlevel%' NEQ '0' ( + echo Требуются права администратора. Перезапуск... + powershell -Command "Start-Process -FilePath '%~f0' -ArgumentList '%*' -Verb RunAs" + exit /b +) + +:: ========================================== +:: Инициализация +:: ========================================== +setlocal EnableDelayedExpansion +set "init=%~dp0\..\settings\init.bat" +call "%init%" + +set "config=%csv%" + +:: ========================================== +:: Аргумент действия +:: ========================================== +set "action=%1" +if "%action%"=="" set "action=reconnect" + +:: ========================================== +:: Обработка CSV +:: ========================================== +for /f "skip=1 tokens=1-8 delims=," %%A in (%config%) do ( + set "App=%%A" + set "From=%%B" + set "To=%%C" + set "Type=%%D" + set "Enabled=%%E" + set "ExtraVariables=%%F" + set "ExtraConnect=%%G" + set "ExtraDisconnect=%%H" + + if "!Enabled!"=="1" ( + :: Разворачиваем стандартные переменные окружения + call set "From=!From!" + call set "To=!To!" + if not "!ExtraConnect!"=="" call set "ExtraConnect=!ExtraConnect!" + if not "!ExtraDisconnect!"=="" call set "ExtraDisconnect=!ExtraDisconnect!" + + :: Выполняем Extra-Variables как команду + if not "!ExtraVariables!"=="" ( + call !ExtraVariables! + ) + + echo ============================== + echo Processing !App! with action %action% (Type=!Type!) + + if /I "!Type!"=="isolate" ( + :: Для isolate исполняем только extra команды + if /I "%action%"=="disconnect" if not "!ExtraDisconnect!"=="" call !ExtraDisconnect! + if /I "%action%"=="connect" if not "!ExtraConnect!"=="" call !ExtraConnect! + if /I "%action%"=="reconnect" ( + if not "!ExtraDisconnect!"=="" call !ExtraDisconnect! + if not "!ExtraConnect!"=="" call !ExtraConnect! + ) + ) else ( + :: default — обычное поведение + if /I "%action%"=="disconnect" call :disconnect + if /I "%action%"=="connect" call :connect + if /I "%action%"=="reconnect" ( + call :disconnect + call :connect + ) + ) + ) +) + +:: ========================================== +:: Завершение +:: ========================================== +:end +endlocal +exit /b + +:: ========================================== +:: Функции +:: ========================================== +:disconnect +echo Removing "!To!"... +rd /S /Q "!To!" 2>nul +if not "!ExtraDisconnect!"=="" call !ExtraDisconnect! +goto :eof + +:connect +echo Creating symlink "!To!" -> "!From!"... +mklink /D "!To!" "!From!" +if not "!ExtraConnect!"=="" call !ExtraConnect! +goto :eof diff --git a/modules/apps-reconnect.bat b/modules/apps-reconnect.bat new file mode 100644 index 0000000..b7faff5 --- /dev/null +++ b/modules/apps-reconnect.bat @@ -0,0 +1,11 @@ +@echo off +setlocal +>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" +if '%errorlevel%' NEQ '0' ( + echo Restarting as Admin... + powershell -Command "Start-Process -FilePath '%~dp0apps-manager.bat' -ArgumentList 'reconnect' -Verb RunAs" + exit /b +) + +call "%~dp0apps-manager.bat" reconnect +endlocal \ No newline at end of file diff --git a/modules/configurations.bat b/modules/configurations.bat deleted file mode 100644 index 8d56f22..0000000 --- a/modules/configurations.bat +++ /dev/null @@ -1,15 +0,0 @@ -setlocal - -set "init=%~dp0\..\settings\init.bat" -call %init% - -for %%f in ("%configurations-all%\*.bat") do ( - echo Running %%f - call "%%f" -) -for %%f in ("%configurations-user%\*.bat") do ( - echo Running %%f - call "%%f" -) - -endlocal \ No newline at end of file diff --git a/modules/export-lists.bat b/modules/export-lists.bat deleted file mode 100644 index 47618fe..0000000 --- a/modules/export-lists.bat +++ /dev/null @@ -1,24 +0,0 @@ -@echo off -setlocal - -set "init=%~dp0\..\settings\init.bat" -call %init% - -if not exist "%packages-user-lists%" ( - mkdir "%packages-user-lists%" -) - -:choco-list -start cmd /c choco export "%packages-user-lists%\choco.config" -::--include-version-numbers - -:msstore-list -start cmd /c winget export -o "%packages-user-lists%\msstore.json" -s "msstore" -:: --include-versions - -:winget-list -start cmd /c winget export -o "%packages-user-lists%\winget.json" -s "winget" -:: --include-versions - -endlocal -exit /B \ No newline at end of file diff --git a/modules/mounts.bat b/modules/mounts-connect.bat similarity index 93% rename from modules/mounts.bat rename to modules/mounts-connect.bat index 64ae365..8cec401 100644 --- a/modules/mounts.bat +++ b/modules/mounts-connect.bat @@ -1,11 +1,11 @@ -@echo off -setlocal - -set "init=%~dp0\..\settings\init.bat" -call %init% - -for %%f in ("%mounts%\*.bat") do ( - echo Running %%f - call "%%f" -) +@echo off +setlocal + +set "init=%~dp0\..\settings\init.bat" +call %init% + +for %%f in ("%mounts%\*.bat") do ( + echo Running %%f + call "%%f" +) endlocal \ No newline at end of file diff --git a/modules/packages.bat b/modules/packages.bat deleted file mode 100644 index c9ed57a..0000000 --- a/modules/packages.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -setlocal - -set "init=%~dp0\..\settings\init.bat" -call %init% - -where choco >nul 2>nul -if %errorlevel% neq 0 ( - echo Chocolatey installing... - powershell -ExecutionPolicy Bypass -File "%chocolatey%" -) else ( - echo Chocolatey has already installed. -) - -call %packages-installer% - -endlocal \ No newline at end of file diff --git a/modules/storage-disconnect.bat b/modules/storage-disconnect.bat new file mode 100644 index 0000000..99c7b8f --- /dev/null +++ b/modules/storage-disconnect.bat @@ -0,0 +1,15 @@ +setlocal + +set "init=%~dp0\..\settings\init.bat" +call %init% + +for %%f in ("%apps-all%\*.bat") do ( + echo Running %%f - disconnect + call "%%f" disconnect +) +for %%f in ("%apps-user%\*.bat") do ( + echo Running %%f - disconnect + call "%%f" disconnect +) + +endlocal \ No newline at end of file diff --git a/modules/storage-reconnect.bat b/modules/storage-reconnect.bat new file mode 100644 index 0000000..1ef06f0 --- /dev/null +++ b/modules/storage-reconnect.bat @@ -0,0 +1,15 @@ +setlocal + +set "init=%~dp0\..\settings\init.bat" +call %init% + +for %%f in ("%legacy%\*.bat") do ( + echo Running %%f - reconnect + call "%%f" +) +for %%f in ("%legacy%\*.bat") do ( + echo Running %%f - reconnect + call "%%f" +) + +endlocal \ No newline at end of file diff --git a/settings/chocolatey.ps1 b/settings/chocolatey.ps1 deleted file mode 100644 index ea25237..0000000 --- a/settings/chocolatey.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Set-ExecutionPolicy RemoteSigned -Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) \ No newline at end of file diff --git a/settings/pin-list.bat b/settings/pin-list.bat deleted file mode 100644 index f19af10..0000000 --- a/settings/pin-list.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -set winget-pin-list=AIMP.AIMP^ -;GNU.Nano^ -;Guru3D.RTSS^ -;Python.Launcher^ -;Python.Python.3.13^ -;Python.Python.3.12 - -set choco-pin-list=nvidia-display-driver^ -;sublimetext4 \ No newline at end of file diff --git a/settings/scoop.ps1 b/settings/scoop.ps1 deleted file mode 100644 index 1f0ee54..0000000 --- a/settings/scoop.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -irm get.scoop.sh -outfile 'install.ps1' -%Temp%\install.ps1 -RunAsAdmin -iex "& {$(irm get.scoop.sh)} -RunAsAdmin" \ No newline at end of file diff --git a/settings/vars.bat b/settings/vars.bat index 8731be7..52bfd9e 100644 --- a/settings/vars.bat +++ b/settings/vars.bat @@ -1,10 +1,7 @@ :: LOCAL :: :: Package Managers -set "chocolatey=%~dp0chocolatey.ps1" -set "scoop=%~dp0scoop.ps1" set "winget=%~dp0winget.ps1" -set "pin-list=%~dp0pin-list.bat" :: Local Root set "data=%root%\data" @@ -16,10 +13,12 @@ set "packages-all-lists=%packages%\[all]" set "packages-user-lists=%packages%\%computername%" set "packages-user-lists-other=%packages-user-lists%\other.bat" -:: Configurations -set "configurations=%data%\configurations" -set "configurations-all=%configurations%\[all]" -set "configurations-user=%configurations%\%computername%" +:: Apps +set "apps=%data%\apps" +set "csv=%data%\apps.csv" +set "apps-all=%apps%\[all]" +set "apps-legacy=%apps%\legacy" +set "apps-user=%apps%\%computername%" :: Mounts set "mounts=%data%\mounts"