diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 9a866662..200590b9 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -1913,11 +1913,7 @@ async function installSoftware(pkgsToInstall) { } installOrdersPre.length && log('info', 'Pre-Install', `Running package-specific pre-installation steps`) for (const script of installOrdersPre) { - console.log(`. "${process.env.HOME}/.bashrc" && ${script.replace(/\n/g, "\\\n")}`) - 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(/'$/, "")}` + await $`${['bash', '-c', script]}` } installOrdersGroups.length && log('info', 'Users / Groups', `Adding groups / users`) for (const group of installOrdersGroups) { diff --git a/software.yml b/software.yml index 231dc980..5f9bed15 100644 --- a/software.yml +++ b/software.yml @@ -10486,9 +10486,7 @@ softwarePackages: _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' apt: wireshark - cask: - - wireshark - - wireshark-chmodbpf + cask: wireshark choco: wireshark dnf: wireshark flatpak: org.wireshark.Wireshark