Fix: Setup-Versionserkennung

Pythonversion wird nun richtig erkannt.
This commit is contained in:
Daniel Spittank 2017-02-05 23:15:21 +01:00
parent 5983d49f51
commit f80857b401

View file

@ -12,24 +12,24 @@ except:
try: try:
# Android # Android
import androidhelper import androidhelper
platform = "Android" plfn = "Android"
except: except:
try: try:
# iOS # iOS
import objc_util import objc_util
platform = "iOS" plfn = "iOS"
except: except:
# Andere, bisher nicht implementiert # Andere, bisher nicht implementiert
print("Velamentum konnte nicht installiert werden.") print("Velamentum konnte nicht installiert werden.")
quit() quit()
# Pfade festlegen # Pfade festlegen
if platform == "Android": if plfn == "Android":
tmpPVSP = "3" if pvt()[0] > 2 else "" tmpPVSP = "3" if int(pvt()[0]) > 2 else ""
archPath = "/sdcard/qpython/scripts" + tmpPVSP + "/tmp" archPath = "/sdcard/qpython/scripts" + tmpPVSP + "/tmp"
biblPath = "/sdcard/qpython/lib/python" + pvt()[0] + "." + pvt()[1] + "/site-packages" biblPath = "/sdcard/qpython/lib/python" + pvt()[0] + "." + pvt()[1] + "/site-packages"
exmpPath = "/sdcard/qpython/scripts" + tmpPVSP + "/Beispiele" exmpPath = "/sdcard/qpython/scripts" + tmpPVSP + "/Beispiele"
elif platform == "iOS": elif plfn == "iOS":
archPath = os.path.expanduser("~/Documents/tmp") archPath = os.path.expanduser("~/Documents/tmp")
biblPath = os.path.expanduser("~/Documents/site-packages") biblPath = os.path.expanduser("~/Documents/site-packages")
exmpPath = os.path.expanduser("~/Documents/Examples") exmpPath = os.path.expanduser("~/Documents/Examples")
@ -52,7 +52,7 @@ arch.extractall(path=archPath)
# Installieren # Installieren
vsrcPath = archPath + "/" + cmid + "/source/" vsrcPath = archPath + "/" + cmid + "/source/"
shutil.move(vsrcPath + platform, biblPath + '/velamentum') shutil.move(vsrcPath + plfn, biblPath + '/velamentum')
shutil.move(vsrcPath + "Examples", exmpPath + '/velamentum') shutil.move(vsrcPath + "Examples", exmpPath + '/velamentum')
# Nicht benötigte Dateien löschen # Nicht benötigte Dateien löschen