repository

Carbs Linux repositories
git clone git://git.carbslinux.org/repository
Log | Files | Refs | README | LICENSE

commit 3f17c8c2a94792638ef1849c97862bd1380cbb0e
parent 4414ced7c1f50ddf8465ed3dbb01a762fd5884b8
Author: Cem Keylan <cem@ckyln.com>
Date:   Sun,  9 Aug 2020 23:52:11 +0300

META: Fix all usage of kiss, replace all with cpt

Diffstat:
Mcommunity/openssh/build | 2+-
Mcore/sinit/message | 28+++++++++++++---------------
Mextra/cmake/build | 2+-
Mextra/distcc/build | 2+-
Mextra/libressl/files/update-certdata.sh | 6+++---
Mextra/libressl/post-install | 2+-
Mextra/opendoas/files/doas.conf | 10+++++++---
Mextra/ubase/build | 2+-
Mxorg/libinput/message | 2+-
Mxorg/xorg-server/message | 2+-
10 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/community/openssh/build b/community/openssh/build @@ -1,7 +1,7 @@ #!/bin/sh -e # Adds optional libedit support -kiss l libedit >/dev/null 2>&1 && +cpt-list libedit >/dev/null 2>&1 && libedit="--with-libedit" ./configure \ diff --git a/core/sinit/message b/core/sinit/message @@ -1,20 +1,18 @@ !! IMPORTANT !! -To start using sinit, edit -/etc/init/sinit-launch-services.boot -And uncomment the getty function, and -Optionally uncomment the runit function -If you deem necessary. +To start using sinit, edit /etc/init/sinit-launch-services.boot and uncomment +the getty function, and optionally uncomment the runit function if you deem +necessary. -sinit is installed as /usr/bin/sinit. It -can fully replace busybox init by running -the following command. +sinit is installed as /usr/bin/sinit. It can fully replace busybox init by +running the following command. - kiss a | grep ^sinit | kiss a - + +----------------------------------------+ + | | + | cpt a | grep ^sinit | cpt a - | + | | + +----------------------------------------+ -NOTE: If swapping from busybox init on a - running system, shutdown/reboot by - invoking 'busybox-init poweroff'. - sinit's poweroff/reboot utilities - can't be of use until it is actually - running. +NOTE: If swapping from busybox init on a running system, shutdown/reboot by + invoking 'busybox-init poweroff'. sinit's poweroff/reboot utilities + can't be of use until it is actually running. diff --git a/extra/cmake/build b/extra/cmake/build @@ -2,7 +2,7 @@ # Use cmake to build cmake if installed. # This leads to a much faster build. -if kiss l cmake; then +if cpt-list cmake; then cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ diff --git a/extra/distcc/build b/extra/distcc/build @@ -2,7 +2,7 @@ # Running distcc as a server instead of a client # requires python to be installed. -kiss l python >/dev/null 2>&1 || pump=disable +cpt-list python >/dev/null 2>&1 || pump=disable export CFLAGS="$CFLAGS -fcommon" diff --git a/extra/libressl/files/update-certdata.sh b/extra/libressl/files/update-certdata.sh @@ -2,12 +2,12 @@ # # update-certdata.sh -[ -w "$KISS_ROOT/etc/ssl" ] || { - printf '%s\n' "${0##*/}: root required to update cert." >&2 +[ -w "$CPT_ROOT/etc/ssl" ] || { + printf '%s\n' "${0##*/}: root required to update CA certificates." >&2 exit 1 } -cd "$KISS_ROOT/etc/ssl" && { +cd "$CPT_ROOT/etc/ssl" && { wget https://curl.haxx.se/ca/cacert.pem mv -f cacert.pem cert.pem printf '%s\n' "${0##*/}: updated cert.pem" diff --git a/extra/libressl/post-install b/extra/libressl/post-install @@ -1,3 +1,3 @@ #!/bin/sh -"$KISS_ROOT/etc/ssl/update-certdata.sh" +"$CPT_ROOT/etc/ssl/update-certdata.sh" diff --git a/extra/opendoas/files/doas.conf b/extra/opendoas/files/doas.conf @@ -4,12 +4,16 @@ # KEEP THIS AT THE BOTTOM. -# This is required if you want to use kiss with 'doas' -# permit keepenv setenv { HOME } :wheel cmd kiss +# This is required if you want to use cpt with 'doas' +# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-alternatives +# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-install +# permit keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-remove # permit :wheel cmd git args fetch # permit :wheel cmd git args merge # Same without asking password -# permit nopass keepenv setenv { HOME } :wheel cmd kiss +# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-alternatives +# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-install +# permit nopass keepenv setenv { HOME } :wheel cmd /usr/bin/cpt-remove # permit nopass :wheel cmd git args fetch # permit nopass :wheel cmd git args merge diff --git a/extra/ubase/build b/extra/ubase/build @@ -9,6 +9,6 @@ make DESTDIR="$1" PREFIX=/usr ubase-box-install unlink "$1/usr/bin/stat" # You cannot execute commands with the ubase -# implementation of su, which might break kiss +# implementation of su, which might break cpt # if the user doesn't have sudo or doas installed. unlink "$1/usr/bin/su" diff --git a/xorg/libinput/message b/xorg/libinput/message @@ -2,7 +2,7 @@ NOTE: You must be a part of the input group for libinput to work. NOTE: This groups based permissions model may not - be suitable if KISS will be used as a multi + be suitable if Carbs Linux will be used as a multi user system. Further configuration can be done at your own discretion. diff --git a/xorg/xorg-server/message b/xorg/xorg-server/message @@ -2,7 +2,7 @@ NOTE: You must be a part of the video group for rootless xorg-server to work. NOTE: This groups based permissions model may not - be suitable if KISS will be used as a multi + be suitable if Carbs Linux will be used as a multi user system. Further configuration can be done at your own discretion.