Restructure packages

2026-05-25 13:19:07 -07:00 · 2025-04-30 14:16:43 -07:00
parent 422c56139f
commit 61e81f33c8
9 changed files with 2 additions and 9 deletions
--- a/install.sh
+++ b/install.sh
@@ -231,7 +231,7 @@ run_as_root() {
 }

 install_pkg_set() {
-  local pkg_file=${BASEDIR}/${1}
+  local pkg_file=${BASEDIR}/packages/${1}
  local pkg_list=""
  if [ ! -f "${pkg_file}" ] ; then
    echo "Package set $(basename "${pkg_file}") does not exist." 1>&2
@@ -436,7 +436,7 @@ case $OPERATION in
    ;;
  package*)
    PKG_SET=${2:-minimal}
-    install_pkg_set "packages.${PKG_SET}"
+    install_pkg_set "${PKG_SET}"
    ;;
  test)
    # Do nothing, just sourcing
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -1,2 +0,0 @@
-gcc-multilib
-g++-multilib
--- a/packages/HHV
+++ b/packages/HHV
--- a/packages/X
+++ b/packages/X
--- a/packages/cli
+++ b/packages/cli
--- a/packages/fonts
+++ b/packages/fonts
--- a/packages/kali
+++ b/packages/kali
--- a/packages/minimal
+++ b/packages/minimal
--- a/python3.pip
+++ b/python3.pip
@@ -1,5 +0,0 @@
-ipython
-keystone-engine
-unicorn
-capstone
-ropper