diff --git a/ChangeLog.txt b/ChangeLog.txt index 0f9aab0..f3e7d48 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Fri Jun 11 16:25:43 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-7mt.txz: Rebuilt + - Removed bash completion file (already included in slackpkg) ++-------------------------+ + Fri Jun 11 15:36:58 CEST 2021 pkg/slackpkg+-1.7.6-noarch-6mt.txz: Rebuilt - slackpkg 15.0.5 incompatible gpg hardening. diff --git a/src/CHANGES b/src/CHANGES index c52bfe2..61f2375 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -92,9 +92,7 @@ 1 => WARNING! One or more errors occurred while slackpkg was running 2 => FATAL! Some operation has failed and need attention -- Bash completation enabled by default - note that you need to install bash_completation - slackpkg install bash_completation +- Bash completation removed (already included in slackpkg) - Works with slackpkg-15 Unfortunately it does not work if $ROOT is non-empty diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 0f9aab0..f3e7d48 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,8 @@ +Fri Jun 11 16:25:43 CEST 2021 +pkg/slackpkg+-1.7.6-noarch-7mt.txz: Rebuilt + - Removed bash completion file (already included in slackpkg) ++-------------------------+ + Fri Jun 11 15:36:58 CEST 2021 pkg/slackpkg+-1.7.6-noarch-6mt.txz: Rebuilt - slackpkg 15.0.5 incompatible gpg hardening. diff --git a/src/slackpkg+.SlackBuild b/src/slackpkg+.SlackBuild index a4f54b3..6fda838 100644 --- a/src/slackpkg+.SlackBuild +++ b/src/slackpkg+.SlackBuild @@ -54,7 +54,6 @@ mkdir -p $PKG cd $PKG mkdir -p etc/slackpkg/ -mkdir -p etc/bash_completion.d/ mkdir -p usr/libexec/slackpkg/functions.d/ mkdir -p usr/doc/slackpkg+-$VERSION/ mkdir -p usr/man/man5 @@ -72,7 +71,6 @@ cp $CWD/checkrepos.sh usr/doc/slackpkg+-$VERSION/ cp $CWD/zchangelog.sh usr/libexec/slackpkg/functions.d/zchangelog.sh cp $CWD/zlookkernel.sh usr/libexec/slackpkg/functions.d/zlookkernel.sh cp $CWD/slackpkg+.SlackBuild usr/doc/slackpkg+-$VERSION/ -cp $CWD/slackpkg.bash_completion etc/bash_completion.d/slackpkg cp $CWD/slackpkgplus.*.sample usr/doc/slackpkg+-$VERSION/ cp $CWD/greylist etc/slackpkg/greylist.new cp $CWD/slack-desc install/ diff --git a/src/slackpkg.bash_completion b/src/slackpkg.bash_completion deleted file mode 100644 index b1f6ae1..0000000 --- a/src/slackpkg.bash_completion +++ /dev/null @@ -1,67 +0,0 @@ -# Slackware slackpkg(8) completion -*- shell-script -*- -# -# This add the bash completation for slackpkg command. -# -# Be sure to install the bash-completation package -# -# # slackpkg install bash-completation -# - -_slackpkg() -{ - local cur prev words cword - _init_completion || return - - local special i wc - wc=${#words[@]} - - for (( i=0; i < ${#words[@]}-1; i++ )); do - if [[ ${words[i]} == @(install|remove|search|upgrade|reinstall|clean-system|upgrade-all|install-new|search|file-search|info|update|new-config|check-updates) ]]; then - special=${words[i]} - break - fi - done - - if [[ -n $special ]]; then - case $special in - upgrade|remove) COMPREPLY=( $( cd /var/log/packages; ls -- $cur* 2>/dev/null|rev|cut -f4- -d-|rev ) ) ;; - update) (( i++ )) ; (( wc-- )) ; [ $i -eq $wc ]&& COMPREPLY=( $( echo gpg|grep "^$cur" ) ) ;; - search) COMPREPLY=( $( grep -- "$cur" /var/lib/slackpkg/pkglist 2>/dev/null|awk '{print $2}'|grep -- "$cur" ) ) ;; - info) COMPREPLY=( $( grep -- " $cur" /var/lib/slackpkg/pkglist 2>/dev/null|awk '{print $2}'|grep -- "^$cur" ) ) ;; - install) COMPREPLY=( $(cd /var/log/packages - grep "^[^ ]* $cur" /var/lib/slackpkg/pkglist 2>/dev/null|awk '{print $2}' | - grep -v -f <(ls -- $cur* 2>/dev/null|rev|cut -f4- -d-|rev|sed -r -e "s/^/^/" -e "s/$/$/") - ) ) - ;; - reinstall) [ ! -z "$cur" ]&& COMPREPLY=( $( cd /var/log/packages - grep "^[^ ]* $cur" /var/lib/slackpkg/pkglist 2>/dev/null| - grep -f <(ls -- $cur* 2>/dev/null) |awk '{print $2}' - ) ) - ;; - update) COMPREPLY=( gpg ) ;; - esac - return 0 - fi - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W ' - -delall=off -checkmd5=off -checkgpg=off -checksize=on - -postinst=off -onoff=off -download_all=off -dialog=off - -batch=on -only_new_dotnew=on - -use_includes=off -spinning=off -default_answer=yes - ' -- "$cur" ) ) - else - - COMPREPLY=( $( compgen -W ' - install remove search upgrade reinstall - clean-system upgrade-all install-new - search file-search - info update new-config check-updates - - - ' -- "$cur" ) ) - - fi - - return 0 -} && -complete -F _slackpkg slackpkg diff --git a/src/slackpkgplus.conf.5 b/src/slackpkgplus.conf.5 index a3e9388..260f07f 100644 --- a/src/slackpkgplus.conf.5 +++ b/src/slackpkgplus.conf.5 @@ -553,11 +553,6 @@ Scripts used to configure slackpkg+ to install multilib of alienbob and to do th The SlackBuild of slackpkg+. Only to be used for consultation; being thrown out of the directory of sources will fail. .in -\fBslackpkg.bash_completion\fP: -.in +5 -If you have the \fB\%bash-completion\fP taken from the repository \fBextra\fP slackware you will automatically have the bash autocompletion function with slackpkg (also queries the pkglist). -.in - \fBslackpkgplus.x86.sample\fP: .in +5 The sample configuration file for 32bit architectures. diff --git a/src/slackpkgplus.conf.5.it b/src/slackpkgplus.conf.5.it index 97d1b23..99fa6d6 100644 --- a/src/slackpkgplus.conf.5.it +++ b/src/slackpkgplus.conf.5.it @@ -550,11 +550,6 @@ Script utilizzabile per configurare slackpkg+ per installare le multilib di alie Lo SlackBuild di slackpkg+. Da usare solo per consultazione; il lancio fuori della directory dei sorgenti fallirà. .in -\fBslackpkg.bash_completion\fP: -.in +5 -Se hai il pacchetto \fB\%bash-completion\fP preso dal repository \fBextra\fP di slackware avrai automaticamente attiva la funzione di autocompletamento di bash con slackpkg (effettua anche le ricerche nel pkglist). -.in - \fBslackpkgplus.x86.sample\fP: .in +5 Il file di configurazione di esempio per le architetture a 32bit.