From 4c08389b5f1d098554137ddde04bec216ce1d22b Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Tue, 2 Jan 2024 10:10:22 +0100 Subject: [PATCH] Update 2024-01-02 10:10 OpenBSD/amd64-x13 --- .bin/dev-showdevelopers | 5 --- .ksh/porttools.ksh | 87 +++++++++++++---------------------------- 2 files changed, 27 insertions(+), 65 deletions(-) delete mode 100755 .bin/dev-showdevelopers diff --git a/.bin/dev-showdevelopers b/.bin/dev-showdevelopers deleted file mode 100755 index 0c52158..0000000 --- a/.bin/dev-showdevelopers +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -ssh sdk@cvs.openbsd.org 'fgrep -v ksh- /etc/passwd' \ - | egrep 111\|122 | grep -v gitsync | cut -d: -f1,5 | tr -s ',' \ - | sed 's/,/, /g;s/,[, ]*$//g' | column -s":" -t | fzf -i -e - diff --git a/.ksh/porttools.ksh b/.ksh/porttools.ksh index c46a020..f80765a 100644 --- a/.ksh/porttools.ksh +++ b/.ksh/porttools.ksh @@ -40,6 +40,7 @@ alias port-remake="_remake" # checking alias port-check="_portcheck" alias port-lib-depends-check="_portlibcheck" +alias port-homepage="_porthomepage" # generating alias port-modcargo-gen-crates="_portmodcargo_gen" @@ -66,16 +67,6 @@ alias dpb-make="_dpbmake" alias port-roach="portroach-cli -m codevoid" alias developers="_listdevs" -_listdevs() { - ssh $ME@cvs.openbsd.org 'fgrep -v ksh- /etc/passwd' \ - | egrep 111\|122 \ - | grep -v gitsync \ - | cut -d: -f1,5 | tr -s ',' \ - | sed 's/,/, /g;s/,[, ]*$//g' \ - | column -s":" -t \ - | fzf -i -e -} - # # FUNCTIONS @@ -117,9 +108,7 @@ _refake() { make fake" } -_reinstall() { - make reinstall" -} +_reinstall() { make reinstall"; } _portgendiff() {( pwd | fgrep -q '/usr/ports/' || return 1 @@ -139,13 +128,8 @@ _portclean() {( doas make fix-permissions )} -_cvscommand() { - doas -u $ME cvs -d $CVSROOT $@ -} - -_cvsupdate() { - _cvscommand -z1 -q up -Pd -A -} +_cvscommand() { doas -u $ME cvs -d $CVSROOT $@; } +_cvsupdate() { _cvscommand -z1 -q up -Pd -A $@; } _cvsupdateall() {( set -x @@ -155,53 +139,27 @@ _cvsupdateall() {( cd /usr/www && _cvsupdate )} -_cvsdiff() { - _cvscommand diff -uNp -} +_cvsdiff() { _cvscommand diff -uNp $@; } +_cvscommit() { _cvscommand commit $@; } +_cvsrelease() { _cvscommand release $@; } +_cvscheckout() { _cvscommand -q -z1 checkout -P $1; } -_cvscommit() { - _cvscommand commit -} - -_cvsrelease() { - _cvscommand release -} - -_cvscheckout() { - _cvscommand -q -z1 checkout -P -} - -_portmark() { - pwd > /var/cache/pmark -} - -_portlast() { - cd "$( /var/cache/pmark; } +_portlast() { cd "$( /dev/null 2>&1 & } -_portcheck() { - /usr/ports/infrastructure/bin/portcheck -} +_portlibcheck() { make port-lib-depends-check; } +_portcheck() { /usr/ports/infrastructure/bin/portcheck; } -_portmodgoupdate() { - make MODGO_VERSION=latest modgo-gen-modules -} - -_portmodcargo_gen() { - make modcargo-gen-crates -} -_portmodcargo_genlic() { - make modcargo-gen-crates-licenses -} +_portmodgoupdate() { make MODGO_VERSION=latest modgo-gen-modules; } +_portmodcargo_gen() { make modcargo-gen-crates; } +_portmodcargo_genlic() { make modcargo-gen-crates-licenses; } _dpbmake() { doas chroot /home/dpb /tmp/installdeps.sh $1 @@ -219,6 +177,15 @@ _prootrebuild() { chmod +x /home/dpb/tmp/installdeps.sh } -_prootshell() { - doas chroot /home/dpb/ ksh -i +_prootshell() { doas chroot /home/dpb/ ksh -i; } + +_listdevs() { + ssh $ME@cvs.openbsd.org 'fgrep -v ksh- /etc/passwd' \ + | egrep 111\|122 \ + | grep -v gitsync \ + | cut -d: -f1,5 | tr -s ',' \ + | sed 's/,/, /g;s/,[, ]*$//g' \ + | column -s":" -t \ + | fzf -i -e } +