Teach ManageConky to use MCNormalise(). I don't know why I wasn't nor…

…malising for Themes.
Conky-for-macOS · Aug 8, 2018 · 29f1067 · 29f1067
1 parent d7814a3
commit 29f1067
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Manage Conky.xcworkspace/xcuserdata/npyl.xcuserdatad/UserInterfaceState.xcuserstate b/Manage Conky.xcworkspace/xcuserdata/npyl.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Manage Conky/MCObjects/MCObjects.m b/Manage Conky/MCObjects/MCObjects.m
@@ -136,14 +136,9 @@ - (void)kill
 - (void)enable
 {
     /*
-     * itemPath must have the spaces replaced by '\'
-     * Because bash is - well... bash! - and it won't
-     * parse them correctly.  Also fix the '(' and ')'.
+     * Custom-Normalise for our needs
      */
-    NSString *correctedItemPath = [_itemPath stringByReplacingOccurrencesOfString:@" "
-                                                                       withString:@"\\ "];
-    correctedItemPath = [correctedItemPath stringByReplacingOccurrencesOfString:@"(" withString:@"\\("];
-    correctedItemPath = [correctedItemPath stringByReplacingOccurrencesOfString:@")" withString:@"\\)"];
+    NSString *correctedItemPath = MCNormalise(_itemPath);
 
     /*
      * IF conky is set to run at startup we must do LaunchAgent housekeeping...
@@ -349,7 +344,6 @@ + (instancetype)themeRepresentationForThemeRC:(NSString *)themeRC
         /*
          * Doing it the conky-manager way...
          */
-
         NSString *themeRoot = [themeRC stringByDeletingLastPathComponent];
 
         NSError *error = nil;
@@ -522,8 +516,10 @@ - (void)enable
         const BOOL keepAlive = YES;
         NSError *error = nil;
 
+        NSString *correctedConfig = MCNormalise(config);
+
         createLaunchAgent(label,
-                          @[CONKY_SYMLINK, @"-c", config],
+                          @[CONKY_SYMLINK, @"-c", correctedConfig],
                           keepAlive,
                           _startupDelay,
                           workingDirectory,