Fixed various versioning bugs

cSploit · Nov 1, 2014 · 085fe3d · 085fe3d
1 parent 5822ee5
commit 085fe3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/dSploit/src/it/evilsocket/dsploit/core/System.java b/dSploit/src/it/evilsocket/dsploit/core/System.java
@@ -698,12 +698,9 @@ private static String readFirstLine(String filePath) {
    * @return the installed version of ruby
    */
   public static String getLocalRubyVersion() {
-    if(mLocalRubyVersion!=null)
-      return mLocalRubyVersion;
-    String line = readFirstLine(getRubyPath() + "/VERSION");
-    if(line!=null)
-      return (mLocalRubyVersion = line);
-    return null;
+    if(mLocalRubyVersion==null)
+      mLocalRubyVersion = readFirstLine(getRubyPath() + "/VERSION");
+    return mLocalRubyVersion;
   }
 
   public static void updateLocalRubyVersion() {
@@ -716,10 +713,8 @@ public static void updateLocalRubyVersion() {
    * @return the version of installed MetaSploit Framework
    */
   public static String getLocalMsfVersion() {
-    if(mLocalMsfVersion!=null)
-      return mLocalMsfVersion;
-
-    mLocalMsfVersion = readFirstLine(getMsfPath() + "/VERSION");
+    if(mLocalMsfVersion==null)
+      mLocalMsfVersion = readFirstLine(getMsfPath() + "/VERSION");
 
     return mLocalMsfVersion;
   }

diff --git a/dSploit/src/it/evilsocket/dsploit/core/UpdateService.java b/dSploit/src/it/evilsocket/dsploit/core/UpdateService.java
@@ -327,7 +327,7 @@ public static void setMsfBranch(String branch) {
         mMsfRepoParser.setBranch(branch);
       }
     } catch (Exception e) {
-      Logger.error(e.getMessage());
+      Logger.error(e.getClass().getName() + ": " + e.getMessage());
     }
   }
 
@@ -376,7 +376,7 @@ public static boolean isMsfUpdateAvailable() {
 
         exitForError = false;
 
-        if (!mMsfInfo.version.equals(localVersion))
+        if (localVersion == null || !localVersion.equals(mMsfInfo.versionString))
           return true;
       }
     } catch (Exception e) {