Substitute tilde with USERPROFILE on Windows

The substitution is now more shell-like and tilde is only replaced from the beginning of the path if it is trailed by a slash.
AlexGTII · Jul 18, 2020 · 7c39907 · 7c39907
1 parent 005d9d3
commit 7c39907
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
@@ -331,11 +331,15 @@ namespace Tools
 
 #if defined(Q_OS_WIN)
         QRegularExpression varRe("\\%([A-Za-z][A-Za-z0-9_]*)\\%");
+        QString homeEnv = "USERPROFILE";
 #else
         QRegularExpression varRe("\\$([A-Za-z][A-Za-z0-9_]*)");
-        subbed.replace("~", environment.value("HOME"));
+        QString homeEnv = "HOME";
 #endif
 
+        if (subbed.startsWith("~/") || subbed.startsWith("~\\"))
+            subbed.replace(0, 1, environment.value(homeEnv));
+
         QRegularExpressionMatch match;
 
         do {

diff --git a/tests/TestTools.cpp b/tests/TestTools.cpp
@@ -72,10 +72,14 @@ void TestTools::testEnvSubstitute()
 #if defined(Q_OS_WIN)
     environment.insert("HOMEDRIVE", "C:");
     environment.insert("HOMEPATH", "\\Users\\User");
+    environment.insert("USERPROFILE", "C:\\Users\\User");
 
     QCOMPARE(Tools::envSubstitute("%HOMEDRIVE%%HOMEPATH%\\.ssh\\id_rsa", environment),
              QString("C:\\Users\\User\\.ssh\\id_rsa"));
     QCOMPARE(Tools::envSubstitute("start%EMPTY%%EMPTY%%%HOMEDRIVE%%end", environment), QString("start%C:%end"));
+    QCOMPARE(Tools::envSubstitute("%USERPROFILE%\\.ssh\\id_rsa", environment),
+             QString("C:\\Users\\User\\.ssh\\id_rsa"));
+    QCOMPARE(Tools::envSubstitute("~\\.ssh\\id_rsa", environment), QString("C:\\Users\\User\\.ssh\\id_rsa"));
 #else
     environment.insert("HOME", QString("/home/user"));
     environment.insert("USER", QString("user"));