From f3a77c7a9e1d171263229f940faa25c14aa8ae25 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Sep 2014 15:31:32 +0100 Subject: [PATCH 08/14] MSYS2: Add ectn_MSYS2 as a LinuxDistro --- src/constants.h | 2 +- src/unixcommand.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/constants.h b/src/constants.h index 175f30f..8bbdfc7 100644 --- a/src/constants.h +++ b/src/constants.h @@ -41,7 +41,7 @@ enum CommandExecuting { ectn_NONE, ectn_MIRROR_CHECK, ectn_SYNC_DATABASE, ectn_RUN_SYSTEM_UPGRADE_IN_TERMINAL, ectn_RUN_IN_TERMINAL }; enum LinuxDistro { ectn_ANTERGOS, ectn_ARCHBANGLINUX, ectn_ARCHBSD, ectn_ARCHLINUX, ectn_CHAKRA, - ectn_KAOS, ectn_MANJAROLINUX, ectn_MOOOSLINUX, ectn_NETRUNNER, ectn_PARABOLA, ectn_UNKNOWN }; + ectn_KAOS, ectn_MANJAROLINUX, ectn_MOOOSLINUX, ectn_NETRUNNER, ectn_PARABOLA, ectn_MSYS2, ectn_UNKNOWN }; enum Language { ectn_LANG_ENGLISH, ectn_LANG_USER_DEFINED }; diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp index d3f2f0e..4d4acbc 100644 --- a/src/unixcommand.cpp +++ b/src/unixcommand.cpp @@ -1017,6 +1017,9 @@ QStringList UnixCommand::getIgnorePkgsFromPacmanConf() LinuxDistro UnixCommand::getLinuxDistro() { static LinuxDistro ret; +#if defined(Q_OS_WIN) + ret = ectn_MSYS2; +#else static bool firstTime = true; if (firstTime) @@ -1080,6 +1083,7 @@ LinuxDistro UnixCommand::getLinuxDistro() file.close(); } } +#endif return ret; } -- 2.8.2