Look for jar files, not zip files when self-installing.

technomancy · Sep 15, 2021 · f5be2be · f5be2be
1 parent a52dfce
commit f5be2be
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/bin/lein b/bin/lein
@@ -98,7 +98,7 @@ function self_install {
   fi
   msg "Downloading Leiningen to $LEIN_JAR now..."
   mkdir -p "$(dirname "$LEIN_JAR")"
-  LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip"
+  LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.jar"
   $HTTP_CLIENT "$LEIN_JAR.pending" "$LEIN_URL"
   local exit_code=$?
   if [ $exit_code == 0 ]; then

diff --git a/bin/lein.bat b/bin/lein.bat
@@ -207,7 +207,7 @@ if not exist %LEIN_INSTALL_DIR% mkdir %LEIN_INSTALL_DIR%
 
 echo Downloading Leiningen now...
 
-set LEIN_JAR_URL=https://github.com/technomancy/leiningen/releases/download/%LEIN_VERSION%/leiningen-%LEIN_VERSION%-standalone.zip
+set LEIN_JAR_URL=https://github.com/technomancy/leiningen/releases/download/%LEIN_VERSION%/leiningen-%LEIN_VERSION%-standalone.jar
 call :DownloadFile "%LEIN_JAR%.pending" "%LEIN_JAR_URL%"
 SET RC=%ERRORLEVEL%
 if not %RC% == 0 goto DOWNLOAD_FAILED

diff --git a/bin/lein.ps1 b/bin/lein.ps1
@@ -102,7 +102,7 @@ function Install-Self
     $jardir = ([IO.FileInfo]$env:LEIN_JAR).Directory.FullName
     if(!(Test-Path $jardir -PathType Container)) {mkdir $jardir |Out-Null}
     @{ # splatting Invoke-WebRequest due to long URI
-        Uri = "https://github.com/technomancy/leiningen/releases/download/$env:LEIN_VERSION/leiningen-$env:LEIN_VERSION-standalone.zip"
+        Uri = "https://github.com/technomancy/leiningen/releases/download/$env:LEIN_VERSION/leiningen-$env:LEIN_VERSION-standalone.jar"
         OutFile = $env:LEIN_JAR
     } |% {Write-Progress 'Install-Self' $_.Uri -CurrentOperation "Downloading to $env:LEIN_JAR" ; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest @_}
     Write-Progress 'Install-Self' -Completed

diff --git a/bin/release b/bin/release
@@ -80,8 +80,7 @@ git commit -a -m "Release $RELEASE_VERSION"
 git tag -s $RELEASE_VERSION -m "Release $RELEASE_VERSION"
 git push && git push --tags && git push origin master:stable
 
-echo "Upload $SELF_INSTALL_JAR and $SELF_INSTALL_JAR.asc to GitHub"
-echo "but rename the jar to .zip first to work around GitHub foolishness."
+echo "Upload $SELF_INSTALL_JAR and $SELF_INSTALL_JAR.asc to GitHub."
 echo "https://github.com/technomancy/leiningen/releases/tag/$RELEASE_VERSION"
 echo "Copy this version's section of NEWS.md to the GitHub release description."