summaryrefslogtreecommitdiff
path: root/plugins/catimg
diff options
context:
space:
mode:
authorEduardo San Martin Morote <posva13@gmail.com>2013-12-09 22:18:20 +0100
committerEduardo San Martin Morote <posva13@gmail.com>2013-12-09 22:18:20 +0100
commit44b23ae194a1580a6af6d692e4ba268d61828929 (patch)
treeb4300f12bc04c2f51f0b1f7db911feb2fe091181 /plugins/catimg
parent349fa15b187a1b2c411db90f2022013caf3479e8 (diff)
downloadzsh-44b23ae194a1580a6af6d692e4ba268d61828929.tar.gz
zsh-44b23ae194a1580a6af6d692e4ba268d61828929.tar.bz2
zsh-44b23ae194a1580a6af6d692e4ba268d61828929.zip
catimg: fix exit without using source
supresses errors from convert whilen converting, as they are usually just warnings
Diffstat (limited to 'plugins/catimg')
-rw-r--r--plugins/catimg/catimg.plugin.zsh2
-rwxr-xr-xplugins/catimg/catimg.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index ee721cd03..70ef9a63c 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -9,7 +9,7 @@
if [[ -x `which convert` ]]; then
function catimg() {
- source $ZSH/plugins/catimg/catimg.sh $@
+ zsh $ZSH/plugins/catimg/catimg.sh $@
}
else
echo "catimg need convert (ImageMagick) to work)"
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index c05fddcd4..cd0f2e333 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -59,7 +59,7 @@ fi
# Display the image
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/,/ /' |
while read R G B f; do
if [ ! "$R" = "NO" ]; then