Update 3 files
- /home/dot_local/bin/symlink_yank - /home/dot_local/bin/executable_install-program - /software.yml
This commit is contained in:
parent
6fb8cbbf3d
commit
4b48d955af
3 changed files with 16 additions and 3 deletions
|
@ -1083,7 +1083,7 @@ async function installPackageList(packageManager, packages) {
|
||||||
if (pkg.substring(0, 4) === 'http') {
|
if (pkg.substring(0, 4) === 'http') {
|
||||||
log('info', 'AppImage Install', `Installing ${pkg} from its URL`)
|
log('info', 'AppImage Install', `Installing ${pkg} from its URL`)
|
||||||
runCommand('Installing ${pkg} via zap', `sudo zap install --select-first -q --from ${pkg}`)
|
runCommand('Installing ${pkg} via zap', `sudo zap install --select-first -q --from ${pkg}`)
|
||||||
} else if ((pkg.match(/\\/g) || []).length === 1) {
|
} else if ((pkg.match(/\//g) || []).length === 1) {
|
||||||
log('info', 'AppImage Install', `Installing ${pkg} from a GitHub Release`)
|
log('info', 'AppImage Install', `Installing ${pkg} from a GitHub Release`)
|
||||||
runCommand('Installing ${pkg} via zap', `sudo zap install --select-first -q --github --from ${pkg}`)
|
runCommand('Installing ${pkg} via zap', `sudo zap install --select-first -q --github --from ${pkg}`)
|
||||||
} else {
|
} else {
|
||||||
|
@ -1429,7 +1429,16 @@ async function pruneInstallOrders(installOrders) {
|
||||||
for (const pkgManager in installOrders) {
|
for (const pkgManager in installOrders) {
|
||||||
log('info', 'Filter', `Filtering the ${pkgManager} installOrders`)
|
log('info', 'Filter', `Filtering the ${pkgManager} installOrders`)
|
||||||
console.log(newOrders[pkgManager])
|
console.log(newOrders[pkgManager])
|
||||||
if (pkgManager === 'apt') {
|
if (pkgManager === 'appimage') {
|
||||||
|
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
|
||||||
|
try {
|
||||||
|
await runSilentCommand(`zap list | grep ${pkg} > /dev/null`)
|
||||||
|
return false
|
||||||
|
} catch (e) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else if (pkgManager === 'apt') {
|
||||||
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
|
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
|
||||||
try {
|
try {
|
||||||
await runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`)
|
await runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`)
|
||||||
|
|
3
home/dot_local/bin/symlink_yank
Normal file
3
home/dot_local/bin/symlink_yank
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{{- if (eq .host.distro.id "ubuntu") -}}
|
||||||
|
/usr/bin/yank-cli
|
||||||
|
{{- end -}}
|
|
@ -3232,7 +3232,7 @@ softwarePackages:
|
||||||
_name: null
|
_name: null
|
||||||
brew:darwin: ideviceinstaller
|
brew:darwin: ideviceinstaller
|
||||||
imagemagick:
|
imagemagick:
|
||||||
_bin: magick
|
_bin: convert
|
||||||
_desc: null
|
_desc: null
|
||||||
_docs: null
|
_docs: null
|
||||||
_github: null
|
_github: null
|
||||||
|
@ -7285,6 +7285,7 @@ softwarePackages:
|
||||||
scoop: sshfs-np
|
scoop: sshfs-np
|
||||||
yank:
|
yank:
|
||||||
_bin: yank
|
_bin: yank
|
||||||
|
_bin:apt: yank-cli
|
||||||
_desc: '[yank](https://github.com/mptre/yank) is a terminal agnostic solution which allows copying output from Termial easily, without the need to use Terminal multiplexers.'
|
_desc: '[yank](https://github.com/mptre/yank) is a terminal agnostic solution which allows copying output from Termial easily, without the need to use Terminal multiplexers.'
|
||||||
_docs: null
|
_docs: null
|
||||||
_github: null
|
_github: null
|
||||||
|
|
Loading…
Reference in a new issue