Extend tools to handle multiple files

CMakeLists.txt

@@ -15,7 +15,7 @@ set(GITTYUP_VERSION
 string(TIMESTAMP CURR_YEAR "%Y")
 add_compile_definitions(CURR_YEAR=${CURR_YEAR})
 configure_file(${CMAKE_SOURCE_DIR}/LICENSE.md.in ${CMAKE_SOURCE_DIR}/LICENSE.md
-               @ONLY)
+               @ONLY NEWLINE_STYLE UNIX)
 
 # Write version to file so it can be used also from external, for example in the
 # github manifest

dep/git/CMakeLists.txt

@@ -4,8 +4,9 @@ if(NOT USE_SYSTEM_GIT)
   macro(add_helper NAME)
     set(TARGET git-credential-${NAME})
     add_executable(${TARGET} ${PATH}/${NAME}/${TARGET}.c)
-    set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                               $<TARGET_FILE_DIR:gittyup>)
+    set_target_properties(
+      ${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                           $<TARGET_FILE_DIR:gittyup>/credential-helpers)
 
     if(${ARGC} GREATER 1)
       target_link_libraries(${TARGET} ${ARGV1})
@@ -14,7 +15,7 @@ if(NOT USE_SYSTEM_GIT)
     if(NOT APPLE)
       install(
         TARGETS ${TARGET}
-        DESTINATION ${CMAKE_INSTALL_BINDIR}
+        DESTINATION ${CMAKE_INSTALL_BINDIR}/credential-helpers
         COMPONENT ${GITTYUP_NAME})
     endif()
   endmacro()

src/cred/CMakeLists.txt

@@ -1,9 +1,4 @@
-if(WIN32)
-  set(CREDENTIAL_IMPL_FILE WinCred.cpp)
-endif()
-
-add_library(cred Cache.cpp Store.cpp CredentialHelper.cpp GitCredential.cpp
-                 ${CREDENTIAL_IMPL_FILE})
+add_library(cred Cache.cpp Store.cpp CredentialHelper.cpp GitCredential.cpp)
 
 target_link_libraries(cred conf git Qt5::Core)
 

src/cred/CredentialHelper.cpp

@@ -10,7 +10,6 @@
 #include "CredentialHelper.h"
 #include "Cache.h"
 #include "GitCredential.h"
-#include "WinCred.h"
 #include "Store.h"
 #include "conf/Settings.h"
 #include "git/Config.h"
@@ -45,13 +44,7 @@ CredentialHelper *CredentialHelper::instance() {
         auto path =
             QString::fromLocal8Bit(qgetenv("HOME") + "/.git-credentials");
         instance = new Store(path);
-      }
-#if defined(Q_OS_WIN)
-      else if (helperName == winCredStoreName) {
-        instance = new WinCred;
-      }
-#endif
-      else {
+      } else {
         instance = new GitCredential(helperName);
       }
     }

src/cred/GitCredential.cpp

@@ -8,6 +8,7 @@
 //
 
 #include "GitCredential.h"
+#include <QStandardPaths>
 #include <QCoreApplication>
 #include <QDir>
 #include <QProcess>
@@ -92,6 +93,46 @@ bool GitCredential::store(const QString &url, const QString &username,
 }
 
 QString GitCredential::command() const {
-  QDir dir(QCoreApplication::applicationDirPath());
-  return dir.filePath(QString("git-credential-%1").arg(mName));
+  QString name = QString("git-credential-%1").arg(mName);
+  QDir appDir = QCoreApplication::applicationDirPath();
+  appDir.cd("credential-helpers");
+
+  // Prefer credential helpers directly installed into Gittyup's app dir
+  QString candidate =
+      QStandardPaths::findExecutable(name, QStringList(appDir.path()));
+  if (!candidate.isEmpty()) {
+    return candidate;
+  }
+
+  candidate = QStandardPaths::findExecutable(name);
+  if (!candidate.isEmpty()) {
+    return candidate;
+  }
+
+#ifdef Q_OS_WIN
+  // Look for GIT CLI installation path
+  QString gitPath = QStandardPaths::findExecutable("git");
+  if (!gitPath.isEmpty()) {
+    QDir gitDir = QFileInfo(gitPath).dir();
+    if (gitDir.dirName() == "cmd" || gitDir.dirName() == "bin") {
+      gitDir.cdUp();
+
+#ifdef Q_OS_WIN64
+      gitDir.cd("mingw64");
+#else
+      gitDir.cd("mingw32");
+#endif
+
+      gitDir.cd("bin");
+
+      candidate =
+          QStandardPaths::findExecutable(name, QStringList(gitDir.path()));
+      if (!candidate.isEmpty()) {
+        return candidate;
+      }
+    }
+  }
+#endif
+
+  return name;
 }