From 8ef6c9cde181e817967d93002f3bc1da768bf9e1 Mon Sep 17 00:00:00 2001 From: Miko <65079739+mikoxyz@users.noreply.github.com> Date: Mon, 8 Mar 2021 19:26:33 +0100 Subject: [PATCH 1/3] Add NetBSD/pkgin support --- packageslist | 1 + setup | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/packageslist b/packageslist index 6b59ba5..32f94e3 100644 --- a/packageslist +++ b/packageslist @@ -15,6 +15,7 @@ # PAC:pacman-package-name # PTG:portage-package-name # PNG:pkgng-package-name +# PIN:pkgin-package-name # SLK:slackpkg-package-name # XBP:xbps-package-name # ZPR:zypper-package-name diff --git a/setup b/setup index c64bb10..7f941ef 100755 --- a/setup +++ b/setup @@ -113,6 +113,7 @@ fi Pacman_MARK='PAC'; Pacman_PM='pacman' ; Pacman_COMMAND="$PERMISSION_COMMAND $Pacman_PM --sync --noconfirm --needed" Portage_MARK='PTG'; Portage_PM='emerge' ; Portage_COMMAND="$PERMISSION_COMMAND $Portage_PM" PKGNG_MARK='PNG'; PKGNG_PM='pkg' ; PKGNG_COMMAND="$PERMISSION_COMMAND $PKGNG_PM install -y" + PKGIN_MARK='PIN'; PKGIN_PM='pkgin' ; PKGIN_COMMAND="$PERMISSION_COMMAND $PKGIN_PM install -y" Slackpkg_MARK='SLK'; Slackpkg_PM='slackpkg' ; Slackpkg_COMMAND="$PERMISSION_COMMAND $Slackpkg_PM install" XBPS_MARK='XBP'; XBPS_PM='xbps-install'; XBPS_COMMAND="$PERMISSION_COMMAND $XBPS_PM --yes" Zypper_MARK='ZPR'; Zypper_PM='zypper' ; Zypper_COMMAND="$PERMISSION_COMMAND $Zypper_PM --non-interactive install" @@ -132,6 +133,9 @@ case $(uname -s | sed -e 's/[[:upper:]]/\L&/g') in 'freebsd'*) PACKAGEMANAGER_MAIN='PKGNG' ;; + 'netbsd'*) + PACKAGEMANAGER_MAIN='PKGIN' + ;; *) for packagemanager_check in 'APT' 'Pacman' 'Portage' 'Slackpkg' 'XBPS' 'Zypper'; do [ -x $(eval "command -v \"\$${packagemanager_check}_PM\"") ] && { @@ -213,6 +217,11 @@ superbbootstrap_PKGNG() { $PERMISSION_COMMAND pkg upgrade -y } +superbbootstrap_PKGIN() { + $PERMISSION_COMMAND pkgin update -y + $PERMISSION_COMMAND pkgin upgrade -y +} + superbbootstrap_Slackpkg() { $PERMISSION_COMMAND slackpkg update gpg $PERMISSION_COMMAND slackpkg update From 91e95b649217b6956d859add6c3e4cc680c139e0 Mon Sep 17 00:00:00 2001 From: NNB <43980777+NNBnh@users.noreply.github.com> Date: Tue, 9 Mar 2021 10:40:47 +0700 Subject: [PATCH 2/3] Update packageslist --- packageslist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageslist b/packageslist index 32f94e3..3eed7b3 100644 --- a/packageslist +++ b/packageslist @@ -14,8 +14,8 @@ # OBP:openbsd-package-name # PAC:pacman-package-name # PTG:portage-package-name -# PNG:pkgng-package-name # PIN:pkgin-package-name +# PNG:pkgng-package-name # SLK:slackpkg-package-name # XBP:xbps-package-name # ZPR:zypper-package-name From 457ebc85da984ae2a9cb0018b384fd079c419155 Mon Sep 17 00:00:00 2001 From: NNB <43980777+NNBnh@users.noreply.github.com> Date: Tue, 9 Mar 2021 10:44:07 +0700 Subject: [PATCH 3/3] Update setup --- setup | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup b/setup index 7f941ef..06bb278 100755 --- a/setup +++ b/setup @@ -112,8 +112,8 @@ fi OpenBSD_MARK='OBP'; OpenBSD_PM='pkg_add' ; OpenBSD_COMMAND="$PERMISSION_COMMAND $OpenBSD_PM -I" Pacman_MARK='PAC'; Pacman_PM='pacman' ; Pacman_COMMAND="$PERMISSION_COMMAND $Pacman_PM --sync --noconfirm --needed" Portage_MARK='PTG'; Portage_PM='emerge' ; Portage_COMMAND="$PERMISSION_COMMAND $Portage_PM" - PKGNG_MARK='PNG'; PKGNG_PM='pkg' ; PKGNG_COMMAND="$PERMISSION_COMMAND $PKGNG_PM install -y" PKGIN_MARK='PIN'; PKGIN_PM='pkgin' ; PKGIN_COMMAND="$PERMISSION_COMMAND $PKGIN_PM install -y" + PKGNG_MARK='PNG'; PKGNG_PM='pkg' ; PKGNG_COMMAND="$PERMISSION_COMMAND $PKGNG_PM install -y" Slackpkg_MARK='SLK'; Slackpkg_PM='slackpkg' ; Slackpkg_COMMAND="$PERMISSION_COMMAND $Slackpkg_PM install" XBPS_MARK='XBP'; XBPS_PM='xbps-install'; XBPS_COMMAND="$PERMISSION_COMMAND $XBPS_PM --yes" Zypper_MARK='ZPR'; Zypper_PM='zypper' ; Zypper_COMMAND="$PERMISSION_COMMAND $Zypper_PM --non-interactive install" @@ -127,15 +127,15 @@ case $(uname -s | sed -e 's/[[:upper:]]/\L&/g') in 'darwin'*) PACKAGEMANAGER_MAIN='Homebrew' ;; - 'openbsd'*) - PACKAGEMANAGER_MAIN='OpenBSD' - ;; 'freebsd'*) PACKAGEMANAGER_MAIN='PKGNG' ;; 'netbsd'*) PACKAGEMANAGER_MAIN='PKGIN' ;; + 'openbsd'*) + PACKAGEMANAGER_MAIN='OpenBSD' + ;; *) for packagemanager_check in 'APT' 'Pacman' 'Portage' 'Slackpkg' 'XBPS' 'Zypper'; do [ -x $(eval "command -v \"\$${packagemanager_check}_PM\"") ] && { @@ -208,13 +208,8 @@ superbbootstrap_Pacman() { } superbbootstrap_Portage() { - $PERMISSION_COMMAND emerge --sync - $PERMISSION_COMMAND emerge --update --newuse --deep --with-bdeps=y @world -} - -superbbootstrap_PKGNG() { - $PERMISSION_COMMAND pkg update -y - $PERMISSION_COMMAND pkg upgrade -y + $PERMISSION_COMMAND emerge --sync + $PERMISSION_COMMAND emerge --update --newuse --deep --with-bdeps=y @world } superbbootstrap_PKGIN() { @@ -222,6 +217,11 @@ superbbootstrap_PKGIN() { $PERMISSION_COMMAND pkgin upgrade -y } +superbbootstrap_PKGNG() { + $PERMISSION_COMMAND pkg update -y + $PERMISSION_COMMAND pkg upgrade -y +} + superbbootstrap_Slackpkg() { $PERMISSION_COMMAND slackpkg update gpg $PERMISSION_COMMAND slackpkg update @@ -234,7 +234,7 @@ superbbootstrap_XBPS() { } superbbootstrap_Zypper() { - $PERMISSION_COMMAND zypper --non-interactive update + $PERMISSION_COMMAND zypper --non-interactive update } superbbootstrap_AUR() {