This commit is contained in:
Brian Zalewski 2023-11-07 08:26:06 +00:00
parent 1742f19134
commit bc309e1f33
2 changed files with 2 additions and 8 deletions

View file

@ -1913,11 +1913,7 @@ async function installSoftware(pkgsToInstall) {
} }
installOrdersPre.length && log('info', 'Pre-Install', `Running package-specific pre-installation steps`) installOrdersPre.length && log('info', 'Pre-Install', `Running package-specific pre-installation steps`)
for (const script of installOrdersPre) { for (const script of installOrdersPre) {
console.log(`. "${process.env.HOME}/.bashrc" && ${script.replace(/\n/g, "\\\n")}`) await $`${['bash', '-c', script]}`
console.log(script.toString())
console.log(script)
console.log(script.replace(/\n/g, "\\\n").replace(/^$'/, ""))
await $`. "${process.env.HOME}/.config/shell/profile.sh" && ${script.replace(/\n/g, "\\\n").replace(/^\$'/, "").replace(/'$/, "")}`
} }
installOrdersGroups.length && log('info', 'Users / Groups', `Adding groups / users`) installOrdersGroups.length && log('info', 'Users / Groups', `Adding groups / users`)
for (const group of installOrdersGroups) { for (const group of installOrdersGroups) {

View file

@ -10486,9 +10486,7 @@ softwarePackages:
_pre:cask: if command -v idl2wrs > /dev/null; then brew uninstall wireshark; fi _pre:cask: if command -v idl2wrs > /dev/null; then brew uninstall wireshark; fi
_when:cask: '! test -d /Applications/Wireshark.app && ! test -d $HOME/Applications/Wireshark.app' _when:cask: '! test -d /Applications/Wireshark.app && ! test -d $HOME/Applications/Wireshark.app'
apt: wireshark apt: wireshark
cask: cask: wireshark
- wireshark
- wireshark-chmodbpf
choco: wireshark choco: wireshark
dnf: wireshark dnf: wireshark
flatpak: org.wireshark.Wireshark flatpak: org.wireshark.Wireshark