query: some macos fixes

Author: Toni500github

scripts/generateVersion.sh

@@ -16,7 +16,7 @@ HASH=${HASH-$(git rev-parse HEAD)}
 BRANCH=${BRANCH-$(git branch --show-current)}
 MESSAGE=${MESSAGE-$(git log -1 --pretty=%B | head -n 1 | sed -e 's/#//g' -e 's/\"//g')}
 DATE=${DATE-$(git show --no-patch --format=%cd --date=local)}
-DIRTY=${DIRTY-$(git diff-index --quiet HEAD && echo -n clean || echo -n dirty)}
+DIRTY=${DIRTY-$(git diff-index --quiet HEAD && echo clean || echo dirty)}
 TAG=${TAG-$(git describe --tags)}
 COMMITS=${COMMITS-$(git rev-list --count HEAD)}
 

src/core-modules/core-modules.cc

@@ -245,7 +245,7 @@ void core_plugins_start(const Config& config)
 
     term_pid  = get_terminal_pid();
     term_name = get_terminal_name();
-    if (hasStart(str_tolower(term_name), "login") || hasStart(term_name, "init") || hasStart(term_name, "(init)"))
+    if (hasStart(str_tolower(term_name), "login") || hasStart(term_name, "/dev/tty") || hasStart(term_name, "init") || hasStart(term_name, "(init)"))
     {
         is_tty    = true;
         term_name = ttyname(STDIN_FILENO);

src/core-modules/macos/disk.cc

@@ -75,7 +75,7 @@ static bool get_disk_info(const callbackInfo_t* callbackInfo, struct statfs* fs)
         die("Module disk doesn't have an argmument to the path/device to query");
 
     const std::string& path = callbackInfo->moduleArgs->value;
-    return (statfs(path.c_str(), fs) != 0);
+    return (statfs(path.c_str(), fs) == 0);
 }
 
 MODFUNC(disk_fsname)