diff --git a/scripts/Arch/Collections/personal.sh b/scripts/Arch/Collections/personal.sh index 5b546c72..fcb3fa41 100755 --- a/scripts/Arch/Collections/personal.sh +++ b/scripts/Arch/Collections/personal.sh @@ -215,19 +215,7 @@ yay --noconfirm -Syu \ visual-studio-code-insiders-bin \ ; -for editor_bin in \ - codium \ - codium-insiders \ - code \ - code-insiders -do - for extension in \ - zokugun.sync-settings \ - zokugun.vsix-manager - do - $editor_bin --install-extension "$extension"; - done; -done; +. "../Common/Config/vscode/install.sh"; { echo "--touch-events"; diff --git a/scripts/Common/Config/vscode/install.sh b/scripts/Common/Config/vscode/install.sh new file mode 100755 index 00000000..ff028bba --- /dev/null +++ b/scripts/Common/Config/vscode/install.sh @@ -0,0 +1,17 @@ +#!/bin/bash +for editor_bin in \ + codium \ + codium-insiders \ + code \ + code-insiders +do + if command -v "$editor_bin" > /dev/null 2>&1 + then + for extension in \ + zokugun.sync-settings \ + zokugun.vsix-manager + do + $editor_bin --install-extension "$extension"; + done; + fi; +done; diff --git a/scripts/Windows/Collections/Generic.ps1 b/scripts/Windows/Collections/Generic.ps1 index 90d681d2..ad97c74e 100644 --- a/scripts/Windows/Collections/Generic.ps1 +++ b/scripts/Windows/Collections/Generic.ps1 @@ -74,6 +74,8 @@ function Restore-GenericApps([Context] $context) { choco install -y --params "/NoDesktopIcon /AssociateWithFiles" vscodium; winget install --scope machine --accept-source-agreements --accept-package-agreements -e --id VSCodium.VSCodium.Insiders --override '/VerySilent /MergeTasks="!runCode,quicklaunchicon,addcontextmenufiles,addcontextmenufolders,associatewithfiles,addtopath"'; + . "$PSScriptRoot/../Config/vscode/Install.ps1"; + choco install -y ` gh ` github-desktop ` diff --git a/scripts/Windows/Config/vscode/Install.ps1 b/scripts/Windows/Config/vscode/Install.ps1 new file mode 100644 index 00000000..a4c13b76 --- /dev/null +++ b/scripts/Windows/Config/vscode/Install.ps1 @@ -0,0 +1,3 @@ +#!/bin/pwsh +. "$PSScriptRoot/../../Scripts/BashScript.ps1"; +Start-BashScript "bash `"$PSScriptRoot/../../../Common/Config/vscode/install.sh`"";