From 473fc3019ea44dea4f3745f153503cd69e0cfc51 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Mon, 9 Jan 2023 08:31:20 +0000 Subject: [PATCH] Update 2 files - /home/dot_local/bin/executable_install-program - /software.yml --- home/dot_local/bin/executable_install-program | 4 ++-- software.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index af6acb1d..afadd62a 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -1531,7 +1531,7 @@ async function linkBin(installOrdersBinLink) { if(!which.sync(binLink.bin, { nothrow: true })) { if (binLink.preference === 'flatpak' && flatpak) { try { - runCommand(`Adding bin link for ${pkg} (${binLink.bin})`, `test -d ${flatpakDir}/app/${pkg} && mkdir -p "${process.env.HOME}/.local/bin/flatpak" && echo "flatpak run ${pkg}" > "${process.env.HOME}/.local/bin/flatpak/${binLink.bin}"`) + runCommand(`Adding bin link for ${pkg} (${binLink.bin})`, `bash -c 'test -d ${flatpakDir}/app/${pkg} && mkdir -p "${process.env.HOME}/.local/bin/flatpak" && echo "flatpak run ${pkg}" > "${process.env.HOME}/.local/bin/flatpak/${binLink.bin}"'`) log('success', 'Bin', `Linked ~/.local/bin/flatpak/${binLink.bin} to the ${pkg} Flatpak`) } catch (e) { log('warn', 'Bin', `Expected flatpak directory not available - ${flatpakDir}/app/${pkg}`) @@ -1541,7 +1541,7 @@ async function linkBin(installOrdersBinLink) { const caskWhen = softwarePackages[binLink.package]["_when:cask"] const caskDir = caskWhen.replace('test -d ', '').replace(/"/g, '') if (fileExists(caskDir)) { - runCommand(`Adding shortcut bin link for ${binLink.package}`, `mkdir -p "${process.env.HOME}/.local/bin/cask" && echo "open ${caskDir}" > "${process.env.HOME}/.local/bin/cask/${binLink.bin}"`) + runCommand(`Adding shortcut bin link for ${binLink.package}`, `bash -c 'mkdir -p "${process.env.HOME}/.local/bin/cask" && echo "open ${caskDir}" > "${process.env.HOME}/.local/bin/cask/${binLink.bin}"'`) } else { log('warn', 'Bin', `Expected Homebrew cask directory not found - ${pkg}`) } diff --git a/software.yml b/software.yml index c644537f..9f38bd26 100644 --- a/software.yml +++ b/software.yml @@ -7464,7 +7464,7 @@ softwarePlugins: plugins: - Microsoft.CST.AttackSurfaceAnalyzer.CLI gh: - cmd: if [ -n "$GITHUB_TOKEN" ] && ! gh extension list | grep {PLUGIN}; then gh extension install {PLUGIN}; fi + cmd: bash -c 'if [ -n "$GITHUB_TOKEN" ] && ! gh extension list | grep {PLUGIN}; then gh extension install {PLUGIN}; fi' plugins: - dlvhdr/gh-dash - github/gh-net @@ -7491,7 +7491,7 @@ softwarePlugins: - view-allocations - who-can vagrant: - cmd: if ! vagrant plugin list | grep {PLUGIN}; then vagrant plugin install {PLUGIN}; fi + cmd: bash -c 'if ! vagrant plugin list | grep {PLUGIN}; then vagrant plugin install {PLUGIN}; fi' plugins: - vagrant-bindfs - vagrant-digitalocean @@ -7502,7 +7502,7 @@ softwarePlugins: - vagrant-vbguest - vagrant-vmware-desktop vscodium: - cmd: if test -n "$(find ~/.vscode/extensions -mindepth 1 -maxdepth 1 -type d -name "$(echo {PLUGIN} | tr "[:upper:]" "[:lower:]")*" -print -quit)"; then codium --install-extension "$(echo {PLUGIN} | tr "[:upper:]" "[:lower:]")"; fi + cmd: bash -c 'if test -n "$(find ~/.vscode/extensions -mindepth 1 -maxdepth 1 -type d -name "$(echo {PLUGIN} | tr "[:upper:]" "[:lower:]")*" -print -quit)"; then codium --install-extension "$(echo {PLUGIN} | tr "[:upper:]" "[:lower:]")"; fi' plugins: - Angular.ng-template - attilabuti.vscode-mjml