diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | ponysay | 17 | ||||
| -rwxr-xr-x | pq4ps-list | 6 |
3 files changed, 12 insertions, 13 deletions
@@ -44,7 +44,6 @@ install-min: truncater install "linklist.pl" "$(INSTALLDIR)/lib/ponysay/linklist.pl" install "pq4ps" "$(INSTALLDIR)/lib/ponysay/pq4ps" install "pq4ps.pl" "$(INSTALLDIR)/lib/ponysay/pq4ps.pl" - install "pq4ps-list" "$(INSTALLDIR)/lib/ponysay/pq4ps-list" install "pq4ps-list.pl" "$(INSTALLDIR)/lib/ponysay/pq4ps-list.pl" mkdir -p "$(INSTALLDIR)/share/licenses/ponysay/" @@ -130,6 +129,7 @@ uninstall-old: if [ -d "$(INSTALLDIR)/share/ponies" ]; then rm -fr "$(INSTALLDIR)/share/ponies" ; fi if [ -d "$(INSTALLDIR)/share/ttyponies" ]; then rm -fr "$(INSTALLDIR)/share/ttyponies" ; fi if [ -f "$(INSTALLDIR)/bin/ponysaytruncater" ]; then unlink "$(INSTALLDIR)/bin/ponysaytruncater" ; fi + if [ -d "$(INSTALLDIR)/lib/ponysay/pq4ps-list" ]; then unlink "$(INSTALLDIR)/lib/ponysay/pq4ps-list" ; fi clean: if [ -f "truncater" ]; then rm -f "truncater" ; fi @@ -15,8 +15,8 @@ HOMESHARE="${HOME}/.local/share/ponysay" listcmd="$INSTALLDIR/lib/ponysay/list.pl" linklistcmd="$INSTALLDIR/lib/ponysay/linklist.pl" truncatercmd="$INSTALLDIR/lib/ponysay/truncater" -qlistcmd="$INSTALLDIR/lib/ponysay/pq4ps-list" quotecmd="$INSTALLDIR/lib/ponysay/pq4ps" +qlistcmd="$INSTALLDIR/lib/ponysay/pq4ps-list.pl" pony="*" # Selected pony wrap="" # Message wrap column @@ -65,15 +65,20 @@ version() { echo "ponysay v$VERSION" } +# Marks ponies in lists that have quotes +qoutelist() { + bash -c "$("$qlistcmd" $("$quotecmd" --list))" +} + # Pony list function list() { if [ -d $SYSTEMPONIES ]; then echo -e "\\e[01mponyfiles located in $SYSTEMPONIES:\\e[21m" - perl $listcmd $scrw $(ls --color=no $SYSTEMPONIES | sed -e 's/\.pony$//' | sort) | $qlistcmd + perl $listcmd $scrw $(ls --color=no $SYSTEMPONIES | sed -e 's/\.pony$//' | sort) | qoutelist fi if [ -d $HOMEPONIES ]; then echo -e "\\e[01mponyfiles located in $HOMEPONIES:\\e[21m" - perl $listcmd $scrw $(ls --color=no $HOMEPONIES | sed -e 's/\.pony$//' | sort) | $qlistcmd + perl $listcmd $scrw $(ls --color=no $HOMEPONIES | sed -e 's/\.pony$//' | sort) | qoutelist fi if [ ! -d $SYSTEMPONIES ] && [ ! -d $HOMEPONIES ]; then echo >&2 "All the ponies are missing! Call the Princess!" @@ -88,9 +93,9 @@ _linklist() { args="" for file in $files; do - target=$(readlink $1"/"$file".pony") + target="$(readlink $1"/"$file".pony")" - if [ $target = "" ]; then + if [ "$target" = "" ]; then target=$file else target=$(echo $target | sed -e 's/^\.\///g' -e 's/\.pony$//g') @@ -99,7 +104,7 @@ _linklist() { args=$(echo $args $file $target) done - perl $listcmd $scrw $(perl $linklistcmd $(echo $args) | sed -e 's/ /_/g') | sed -e 's/_/ /g' | $qlistcmd + perl $listcmd $scrw $(perl $linklistcmd $(echo $args) | sed -e 's/ /_/g') | sed -e 's/_/ /g' | qoutelist } # Pony list function with symlink map, for both directories diff --git a/pq4ps-list b/pq4ps-list deleted file mode 100755 index 99203ba..0000000 --- a/pq4ps-list +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -cmd="$(echo "$0" | sed -e 's/\-list$//g')" -pl="$0.pl" - -bash -c "$("$pl" $($cmd --list))" |