From cbba7256e5985b2e6faaccf93f01ebc78d0f0423 Mon Sep 17 00:00:00 2001 From: Jesse Hitch Date: Sun, 4 Dec 2022 21:06:51 +0100 Subject: [PATCH] fix for OS Error around get_apt_list.sh not existing --- onboardme/config/packages.yml | 2 +- onboardme/pkg_management.py | 5 ----- onboardme/scripts/get_apt_list.sh | 3 +++ pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/onboardme/config/packages.yml b/onboardme/config/packages.yml index f10e77cc..f86aee31 100644 --- a/onboardme/config/packages.yml +++ b/onboardme/config/packages.yml @@ -158,7 +158,7 @@ brew: apt: emoji: "🙃" commands: - list: "PWD/scripts/get_apt_list.sh" + list: "./scripts/get_apt_list.sh" update: "sudo apt-get update -y" upgrade: "sudo apt-get upgrade -y" install: "sudo apt-get install -y " diff --git a/onboardme/pkg_management.py b/onboardme/pkg_management.py index 8263efdf..2cdbfdc7 100755 --- a/onboardme/pkg_management.py +++ b/onboardme/pkg_management.py @@ -91,11 +91,6 @@ def run_pkg_mngrs(pkg_mngrs=[], pkg_groups=[]): # run the list command for the given package manager list_cmd = pkg_cmds['list'] - - # manually expanding, b/c there's not good way 2 do fstring via yml - if pkg_mngr == 'apt': - list_cmd = path.join(PWD, list_cmd.replace("PWD/", "")) - list_pkgs = subproc([list_cmd], quiet=True) if list_pkgs: diff --git a/onboardme/scripts/get_apt_list.sh b/onboardme/scripts/get_apt_list.sh index 422e6291..242d81c9 100755 --- a/onboardme/scripts/get_apt_list.sh +++ b/onboardme/scripts/get_apt_list.sh @@ -1 +1,4 @@ +#!/bin/bash + +# list apt packages by only their short name apt list --installed | cut -d '/' -f 1 diff --git a/pyproject.toml b/pyproject.toml index 09586819..76449b36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "onboardme" -version = "0.15.14_a1" +version = "0.15.14" description = "An onboarding tool to install dot files and packages including a default mode with sensible defaults to run on most computers running Debian based distros or macOS." authors = ["Jesse Hitch "] license = "AGPL-3.0-or-later"