fix for #44

mdbergmann · Apr 22, 2018 · a5d8246 · a5d8246
1 parent 3569a02
commit a5d8246
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Eloquent-AppStore-Info.plist b/Eloquent-AppStore-Info.plist
@@ -43,7 +43,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3003</string>
+	<string>3008</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>NSAppTransportSecurity</key>

diff --git a/Info.plist b/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.2</string>
+	<string>2.6.2-beta2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -43,7 +43,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3003</string>
+	<string>3008</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>NSAppTransportSecurity</key>

diff --git a/buildnumber b/buildnumber
@@ -1 +1 @@
-3003
+3008
diff --git a/src/AppController.m b/src/AppController.m
@@ -55,6 +55,9 @@ + (void)initialize {
 
 /**
  sets up all needed folders so the application can work
+
+ !!! Do not create the "Sword" folder here. This is created by ObjCSword including the required 'modules' and 'mods.d' folders.
+
  */
 - (BOOL)setupFolders {
     NSString *folder = [[FolderUtil urlForAppInAppSupport] path];
@@ -121,7 +124,7 @@ - (id)init {
 
         // check whether this is the first start of Eloquent
         NSString *prefsPath = PREFS_FILE;
-        NSString *moduleFolder = [[FolderUtil urlForModulesFolder] path];
+        NSString *moduleFolder = [[Configuration config] defaultModulePath];
         if(![fm fileExistsAtPath:prefsPath] && [fm fileExistsAtPath:moduleFolder]) {
             // show Alert
             NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Warning", @"") 

diff --git a/src/Utils/FolderUtil.swift b/src/Utils/FolderUtil.swift
@@ -81,7 +81,6 @@ import Cocoa
             modulesFolder = urlForAppSupportFolder()?.appendingPathComponent("Sword")
             if !FileManager.default.fileExists(atPath:modulesFolder!.path) {
                 try! FileManager.default.createDirectory(atPath:modulesFolder!.path, withIntermediateDirectories:false, attributes:nil)
-                try! FileManager.default.createFile(atPath:modulesFolder!.path+"/mods.conf", contents:Data())
             }
         }
         return modulesFolder