Project: Have rake dist make the correct folder name from the version tag

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 Build
-Dist
+santa-*
 Pods
 Santa.xcodeproj/xcuserdata
 Santa.xcodeproj/project.xcworkspace

Rakefile

@@ -1,7 +1,6 @@
 WORKSPACE           = 'Santa.xcworkspace'
 DEFAULT_SCHEME      = 'All'
 OUTPUT_PATH         = 'Build'
-DIST_PATH           = 'Dist'
 BINARIES            = ['Santa.app', 'santa-driver.kext']
 DSYMS               = ['Santa.app.dSYM', 'santa-driver.kext.dSYM', 'santad.dSYM', 'santactl.dSYM']
 XCPRETTY_DEFAULTS   = '-sc'
@@ -56,7 +55,6 @@ desc "Clean"
 task :clean => :init do
   puts "Cleaning"
   FileUtils.rm_rf(OUTPUT_PATH)
-  FileUtils.rm_rf(DIST_PATH)
 end
 
 # Build
@@ -111,24 +109,26 @@ task :dist do
   Rake::Task['clean'].invoke()
   Rake::Task['build:build'].invoke("Release")
 
-  FileUtils.rm_rf(DIST_PATH)
+  dist_path = "santa-#{`defaults read #{xcodebuilddir}/Release/santa-driver.kext/Contents/Info.plist CFBundleVersion`.strip}"
 
-  FileUtils.mkdir_p("#{DIST_PATH}/binaries")
-  FileUtils.mkdir_p("#{DIST_PATH}/conf")
-  FileUtils.mkdir_p("#{DIST_PATH}/dsym")
+  FileUtils.rm_rf(dist_path)
+
+  FileUtils.mkdir_p("#{dist_path}/binaries")
+  FileUtils.mkdir_p("#{dist_path}/conf")
+  FileUtils.mkdir_p("#{dist_path}/dsym")
 
   BINARIES.each do |x|
-    FileUtils.cp_r("#{xcodebuilddir}/Release/#{x}", "#{DIST_PATH}/binaries")
+    FileUtils.cp_r("#{xcodebuilddir}/Release/#{x}", "#{dist_path}/binaries")
   end
 
   DSYMS.each do |x|
-    FileUtils.cp_r("#{xcodebuilddir}/Release/#{x}", "#{DIST_PATH}/dsym")
+    FileUtils.cp_r("#{xcodebuilddir}/Release/#{x}", "#{dist_path}/dsym")
   end
 
 
-  Dir.glob("Conf/*") {|x| File.directory?(x) or FileUtils.cp(x, "#{DIST_PATH}/conf")}
+  Dir.glob("Conf/*") {|x| File.directory?(x) or FileUtils.cp(x, "#{dist_path}/conf")}
 
-  puts "Distribution folder created"
+  puts "Distribution folder #{dist_path} created"
 end
 
 # Tests

Source/SantaGUI/SNTAppDelegate.m

@@ -38,7 +38,7 @@
 
   self.configFileWatcher = [[SNTFileWatcher alloc] initWithFilePath:kDefaultConfigFilePath
                                                             handler:^(unsigned long data) {
-    [[SNTConfigurator configurator] reloadConfigData];
+    if (! (data & DISPATCH_VNODE_ATTRIB)) [[SNTConfigurator configurator] reloadConfigData];
   }];
 
   self.notificationManager = [[SNTNotificationManager alloc] init];

Source/common/SNTFileWatcher.h

@@ -26,7 +26,6 @@
 ///  @param filePath the file to watch.
 ///  @param handler the handler to call when changes happen. The argument to the block is the
 ///      type of change that happened as a bitmask to be compared with DISPATCH_VNODE_* constants.
-///      The handler is always be called on the main thread.
 ///
 - (nonnull instancetype)initWithFilePath:(nonnull NSString *)filePath
                                  handler:(nonnull void (^)(unsigned long))handler;

Source/common/SNTFileWatcher.m

@@ -62,20 +62,17 @@
     dispatch_source_set_event_handler(self.source, ^{
       STRONGIFY(self);
       unsigned long data = dispatch_source_get_data(self.source);
-      dispatch_async(dispatch_get_main_queue(), ^{
-        self.handler(data);
-      });
+      self.handler(data);
       if (data & DISPATCH_VNODE_DELETE || data & DISPATCH_VNODE_RENAME) {
         [self stopWatchingFile];
         [self startWatchingFile];
       }
+      sleep(2);
     });
 
     dispatch_source_set_registration_handler(self.source, ^{
       STRONGIFY(self);
-      dispatch_async(dispatch_get_main_queue(), ^{
-        self.handler(0);
-      });
+      self.handler(0);
     });
 
     dispatch_source_set_cancel_handler(self.source, ^{