Line endings are now unix. When installing, had to extract for mac and rename to osx
This commit is contained in:
10
convert.py
10
convert.py
@@ -41,8 +41,10 @@ def downloadImagemagick():
|
|||||||
os.remove("imagemagick.zip")
|
os.remove("imagemagick.zip")
|
||||||
elif(sys.platform == "darwin"):
|
elif(sys.platform == "darwin"):
|
||||||
urllib.request.urlretrieve ("https://imagemagick.org/download/binaries/ImageMagick-x86_64-apple-darwin17.7.0.tar.gz", "imagemagick.tar.gz")
|
urllib.request.urlretrieve ("https://imagemagick.org/download/binaries/ImageMagick-x86_64-apple-darwin17.7.0.tar.gz", "imagemagick.tar.gz")
|
||||||
tarfile.open("imagemagick.tar.gz","r:gz").extractall(getImagemagickPath())
|
tarfile.open("imagemagick.tar.gz","r:gz").extractall("imagemagick/")
|
||||||
os.remove("imagemagick.tar.gz")
|
os.remove("imagemagick.tar.gz")
|
||||||
|
os.rename("imagemagick/ImageMagick-7.0.8", getImagemagickPath())
|
||||||
|
|
||||||
else:
|
else:
|
||||||
print("ImageMagick already downloaded.")
|
print("ImageMagick already downloaded.")
|
||||||
|
|
||||||
@@ -56,14 +58,14 @@ def getImagemagickPath():
|
|||||||
|
|
||||||
def getImagemagickExe():
|
def getImagemagickExe():
|
||||||
if(os.name == "nt"):
|
if(os.name == "nt"):
|
||||||
return getImagemagickPath() + "\\convert.exe"
|
return getImagemagickPath() + "convert.exe"
|
||||||
elif(sys.platform == "darwin"):
|
elif(sys.platform == "darwin"):
|
||||||
currentDir = os.path.dirname(os.path.realpath(__file__))
|
currentDir = os.path.dirname(os.path.realpath(__file__))
|
||||||
global magickHome
|
global magickHome
|
||||||
magickHome = "export MAGICK_HOME=" + currentDir + getImagemagickPath() + ";"
|
magickHome = "export MAGICK_HOME=" + currentDir + "/" + getImagemagickPath() + ";"
|
||||||
global dyldLibrary
|
global dyldLibrary
|
||||||
dyldLibrary = "export DYLD_LIBRARY_PATH=$MAGICK_HOME/lib;"
|
dyldLibrary = "export DYLD_LIBRARY_PATH=$MAGICK_HOME/lib;"
|
||||||
return getImagemagickPath() + "/bin/convert"
|
return getImagemagickPath() + "bin/convert"
|
||||||
else:
|
else:
|
||||||
returnErrorAndExit("Your os is not supported. Try using Windows or OSX")
|
returnErrorAndExit("Your os is not supported. Try using Windows or OSX")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user