linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

catimg: fix exit without using source

Browse source 
supresses errors from convert whilen converting, as they
are usually just warnings
This commit is contained in:
Eduardo San Martin Morote 2013-12-09 22:18:20 +01:00
parent 349fa15b18
commit 44b23ae194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/catimg/catimg.plugin.zsh
View file

@ -9,7 +9,7 @@
if [[ -x `which convert` ]]; then if [[ -x `which convert` ]]; then
function catimg() { function catimg() {
source $ZSH/plugins/catimg/catimg.sh $@ zsh $ZSH/plugins/catimg/catimg.sh $@
} }
else else
echo "catimg need convert (ImageMagick) to work)" echo "catimg need convert (ImageMagick) to work)"

2
plugins/catimg/catimg.sh
View file

@ -59,7 +59,7 @@ fi
# Display the image # Display the image
I=0 I=0
convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- | convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' | sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
while read R G B f; do while read R G B f; do
if [ ! "$R" = "NO" ]; then if [ ! "$R" = "NO" ]; then