avoid hardwired cygwin mirror;
authorwenzelm
Mon, 04 Jun 2018 22:04:45 +0200
changeset 68375 5714e8806060
parent 68374 8740e1241555
child 68376 78147871f5b3
avoid hardwired cygwin mirror;
Admin/Windows/Cygwin/Cygwin-Setup.bat
Admin/lib/Tools/makedist_bundle
--- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Jun 04 21:57:38 2018 +0200
+++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Jun 04 22:04:45 2018 +0200
@@ -1,3 +1,3 @@
 @echo off
 
-"%CD%\contrib\cygwin\isabelle\cygwin" --site https://isabelle.sketis.net/cygwin_2018 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
+"%CD%\contrib\cygwin\isabelle\cygwin" --site {MIRROR} --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
--- a/Admin/lib/Tools/makedist_bundle	Mon Jun 04 21:57:38 2018 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Mon Jun 04 22:04:45 2018 +0200
@@ -284,8 +284,12 @@
     (
       cd "$ISABELLE_TARGET"
 
-      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
-        "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
+      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
+
+      CYGWIN_MIRROR="$(cat contrib/cygwin/isabelle/cygwin_mirror)"
+      cat "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" | \
+        perl -p > "Cygwin-Setup.bat" -e "s,{MIRROR},$CYGWIN_MIRROR,;"
+      chmod +x "Cygwin-Setup.bat"
 
       for NAME in postinstall rebaseall
       do