diff --git a/matrixpack.sh b/matrixpack.sh index e99e7f98dd8465845759de69af7fd409743affec..82964a1c01167ed195badbfa1a60cb43976c597e 100755 --- a/matrixpack.sh +++ b/matrixpack.sh @@ -27,7 +27,6 @@ slug_homeserver() { echo "$1" | iconv -c -t ascii//TRANSLIT | sed -E 's/^http:\/\/|^https:\/\///g' | sed -E 's/^-+|-+$//g' } -<<<<<<< HEAD # COMMON REQUIRED BINARIES require convert require montage @@ -37,8 +36,6 @@ require curl require sed require tr -======= ->>>>>>> 2964af55e9a55fa78c0a746392860227d28ff09a # Checking params if test $# -lt 3 ; then echo 1>&2 "$0:FATAL: invalid argument number (expected 3)" @@ -46,12 +43,6 @@ if test $# -lt 3 ; then exit 1 fi -# Checking if ImageMagick is installed -if ! command -v convert &> /dev/null && ! command -v montage &> /dev/null; then - echo "$0:ERROR: ImageMagick could not be found" - exit -fi - # Setting variables dir=$(pwd) token=$1