tools v3.8

version 2 - a minor change to one script.
apprenticeharper · Mar 5, 2015 · 529dd3f · 529dd3f
1 parent 4163d5c
commit 529dd3f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/Calibre_Plugins/k4mobidedrm_plugin.zip b/Calibre_Plugins/k4mobidedrm_plugin.zip
diff --git a/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py b/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+	k4 = False
+	kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ def run(self, path_to_ebook):
             import mobidedrm
 
             k4 = True
+	    if sys.platform.startswith('linux'):
+		k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ def run(self, path_to_ebook):
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+	k4 = False
+	kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ def run(self, path_to_ebook):
             import mobidedrm
 
             k4 = True
+	    if sys.platform.startswith('linux'):
+		k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ def run(self, path_to_ebook):
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+	k4 = False
+	kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ def run(self, path_to_ebook):
             import mobidedrm
 
             k4 = True
+	    if sys.platform.startswith('linux'):
+		k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ def run(self, path_to_ebook):
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
diff --git a/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py b/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+	k4 = False
+	kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ def run(self, path_to_ebook):
             import mobidedrm
 
             k4 = True
+	    if sys.platform.startswith('linux'):
+		k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ def run(self, path_to_ebook):
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'