fixup! build-and-deploy(i686): rebase the .dll base addresses

Let's try this.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

.github/workflows/build-and-deploy.yml

@@ -162,19 +162,22 @@ jobs:
           cd C:\git-sdk-32-full
           if (!$?) { exit(1); }
 
-          $env:PATH += ";$(Get-Location)\usr\bin"
-          usr\bin\sh.exe -lc "find /usr/lib/perl5/*_perl -name \*.dll >perl-dlls.txt"
+          $env:MSYSTEM = "MINGW32"
+          $env:PATH = "$(Get-Location)\usr\bin;" + $env:PATH
+          sh.exe -lc "set -x && find /usr/lib/perl5/*_perl -name \*.dll >perl-dlls.txt"
           type perl-dlls.txt
-          usr\bin\dash /usr/bin/rebaseall -p -T perl-dlls.txt
+          dash -x /usr/bin/rebaseall -p -T perl-dlls.txt
 
           # Work around for:
           # - address space needed by 'Cwd.dll' is already occupied
           # - address space needed by 'Dumper.dll' is already occupied
           # etc
-          usr\bin\bash -lc "/usr/bin/rebase -b 0x61500000 /usr/lib/perl5/core_perl/auto/*/{*,*/*}.dll"
+          bash -lc "set -x && rebase -b 0x61500000 /usr/lib/perl5/core_perl/auto/*/{*,*/*}.dll"
           # Work around for:
           # - address space needed by 'Cwd.dll' is already occupied
-          usr\bin\bash -lc "/usr/bin/rebase -v -b 0x63f00000 /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
+          bash -lc "set -x && rebase -v -b 0x63f00000 /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
+          # verify the base address
+          bash -lc "set -x && rebase -v -i /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
 
       - name: Get GPG key(s)
         shell: bash