Merge pull request #6 from hoshsadiq/improve-windows-support

maxatome · web-flow · commit d756a85b45c5 · 2022-03-09T22:06:36.000+01:00
Improve windows support
diff --git a/install-go.pl b/install-go.pl
@@ -55,7 +55,7 @@
 my($ARCH, $EXT) = ('amd64', 'tar.gz');
 my $OS;
 if ($^O eq 'linux' or $^O eq 'freebsd' or $^O eq 'darwin') { $OS = $^O }
-elsif ($^O eq 'msys' or $^O eq 'cygwin')
+elsif ($^O eq 'msys' or $^O eq 'cygwin' or $^O eq 'MSWin32')
 {
     $OS = 'windows';
     $EXT = 'zip';
@@ -233,7 +233,7 @@ sub install_go
     if ($EXT eq 'zip')
     {
         exe(qw(curl -L -s -o x.zip), $url);
-        exe(qw(unzip x.zip go/bin/* go/pkg/* go/src/*));
+        exe(qw(unzip x.zip go/bin/* go/pkg/**/* go/src/**/*));
         unlink 'x.zip';
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`my($ARCH, $EXT) = ('amd64', 'tar.gz');`
`56`	`56`	`my $OS;`
`57`	`57`	`if ($^O eq 'linux' or $^O eq 'freebsd' or $^O eq 'darwin') { $OS = $^O }`
`58`		`-elsif ($^O eq 'msys' or $^O eq 'cygwin')`
	`58`	`+elsif ($^O eq 'msys' or $^O eq 'cygwin' or $^O eq 'MSWin32')`
`59`	`59`	`{`
`60`	`60`	`$OS = 'windows';`
`61`	`61`	`$EXT = 'zip';`
`@@ -233,7 +233,7 @@ sub install_go`
`233`	`233`	`if ($EXT eq 'zip')`
`234`	`234`	`{`
`235`	`235`	`exe(qw(curl -L -s -o x.zip), $url);`
`236`		`- exe(qw(unzip x.zip go/bin/* go/pkg/* go/src/*));`
	`236`	`+ exe(qw(unzip x.zip go/bin/* go/pkg/*/ go/src/*/));`
`237`	`237`	`unlink 'x.zip';`
`238`	`238`	`}`
`239`	`239`	`else`