Merge pull request #850 from EDM115/master

fix: works when ran through a symlink, #849
AlDanial · Aug 25, 2024 · 1f11b89 · 1f11b89
2 parents 465ed6d + 237c5e3
commit 1f11b89
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/Unix/AUTHORS b/Unix/AUTHORS
@@ -31,4 +31,5 @@ https://github.com/Inventitech
 https://github.com/zhangzqs
 https://github.com/drkameleon
 https://github.com/jackos
-https://github.com/Aerek-Yasa
+https://github.com/Aerek-Yasa
+https://github.com/EDM115
diff --git a/Unix/cloc b/Unix/cloc
@@ -111,6 +111,19 @@ if ($ON_WINDOWS and $ENV{'SHELL'}) {
     }
 }
 
+use Cwd "abs_path";
+use File::Spec;
+# Fix for issues when runing cloc through a symlink on Windows
+# e.g. : it have been installed with Winget
+# See https://github.com/AlDanial/cloc/issues/849
+if ($ON_WINDOWS) {
+    my $exec_path = abs_path($0);
+    if (-l $0) {
+        $exec_path = abs_path(readlink($0));
+    }
+    $0 = $exec_path;
+}
+
 my $HAVE_Win32_Long_Path = 0;
 # Win32::LongPath is an optional dependency that when available on
 # Windows will be used to support reading files past the 255 char

diff --git a/cloc b/cloc
@@ -136,6 +136,19 @@ if ($ON_WINDOWS and $ENV{'SHELL'}) {
     }
 }
 
+use Cwd "abs_path";
+use File::Spec;
+# Fix for issues when runing cloc through a symlink on Windows
+# e.g. : it have been installed with Winget
+# See https://github.com/AlDanial/cloc/issues/849
+if ($ON_WINDOWS) {
+    my $exec_path = abs_path($0);
+    if (-l $0) {
+        $exec_path = abs_path(readlink($0));
+    }
+    $0 = $exec_path;
+}
+
 my $HAVE_Win32_Long_Path = 0;
 # Win32::LongPath is an optional dependency that when available on
 # Windows will be used to support reading files past the 255 char