diff options
| -rw-r--r-- | system/fish/README | 15 | ||||
| -rw-r--r-- | system/fish/doinst.sh | 2 | ||||
| -rw-r--r-- | system/fish/fish.SlackBuild | 34 | ||||
| -rw-r--r-- | system/fish/fish.info | 10 | ||||
| -rw-r--r-- | system/fish/slack-desc | 2 |
5 files changed, 34 insertions, 29 deletions
diff --git a/system/fish/README b/system/fish/README index 23d9f9a9b1340..f3b1ad1ffad2e 100644 --- a/system/fish/README +++ b/system/fish/README @@ -1,12 +1,15 @@ fish (Friendly Interactive SHell) is a user friendly command line shell for UNIX-like operating systems. -Post installation, fish outputs the following message regarding setting up -fish as your primary shell: - To run fish, type 'fish' in your terminal. -To use fish as your login shell: - * add the line '/usr/bin/fish' to the file '/etc/shells'. - * use the command 'chsh -s /usr/bin/fish'. +This SlackBuild automatically add fish on /etc/shells. + +To use fish as your login shell, run command: + +$ chsh -s /usr/bin/fish + +To remove fish from the /etc/shells, in case of fish removal, please run: + +$ su -c "sed -ri '\|^/usr/bin/fish$|d' /etc/shells" This package will potentially conflict with the /usr/games/fish binary from the y/bsdgames package. In a stock installation with default PATH diff --git a/system/fish/doinst.sh b/system/fish/doinst.sh index d34cf8602d15c..1632c14d330ab 100644 --- a/system/fish/doinst.sh +++ b/system/fish/doinst.sh @@ -13,3 +13,5 @@ config() { config etc/fish/config.fish.new +# add Fish to /etc/shells +grep -qe '^/usr/bin/fish$' /etc/shells || echo '/usr/bin/fish' >> /etc/shells diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild index bd74a37a720dc..8f8efafc2a78d 100644 --- a/system/fish/fish.SlackBuild +++ b/system/fish/fish.SlackBuild @@ -1,11 +1,12 @@ #!/bin/sh - -# Slackware build script for the fish shell - +# +# Slackware build script for the fish shell. +# # Updated for version 1.23.1 20/09/2009 # Updated for Slackware64 28/05/2009 - +# # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> +# Copyright 2015, Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +27,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fish -VERSION=1.23.1 -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.2.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -63,14 +64,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -89,18 +90,17 @@ make install DESTDIR=$PKG # Let's not clobber the config mv $PKG/etc/fish/config.fish $PKG/etc/fish/config.fish.new -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l); do - ln -s $(readlink $i).gz $i.gz - rm $i - done -) +mv $PKG/usr/share/$PRGNAM/man/man1/* $PKG/usr/man/man1 +rm -rf $PKG/usr/share/fish/man/ +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -cp -a INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +# Remove manual pages that overwrites coreutils' man pages +rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true}.1.gz +cp -a CONTRIBUTING.md COPYING README.md release_notes.html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/fish/fish.info b/system/fish/fish.info index c0e038f0e4f6b..aade8892cade0 100644 --- a/system/fish/fish.info +++ b/system/fish/fish.info @@ -1,10 +1,10 @@ PRGNAM="fish" -VERSION="1.23.1" +VERSION="2.2.0" HOMEPAGE="http://fishshell.com/" -DOWNLOAD="http://downloads.sourceforge.net/fish/fish-1.23.1.tar.bz2" -MD5SUM="ead6b7c6cdb21f35a3d4aa1d5fa596f1" +DOWNLOAD="http://fishshell.com/files/2.2.0/fish-2.2.0.tar.gz" +MD5SUM="f6c3d940148593ff6648adb07986cbcb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Martin Matejek" -EMAIL="matejek.martin@gmail.com" +MAINTAINER="Edinaldo P. Silva" +EMAIL="edps.mundognu@gmail.com" diff --git a/system/fish/slack-desc b/system/fish/slack-desc index 28262cbb8261a..967da1a55f54e 100644 --- a/system/fish/slack-desc +++ b/system/fish/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fish: fish (Friendly Interactive SHell) +fish: fish (Friendly Interactive Shell) fish: fish: fish is a user friendly command line shell for UNIX-like systems. fish: |