Skip to content

Commit f5be2be

Browse files
committed
Look for jar files, not zip files when self-installing.
1 parent a52dfce commit f5be2be

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

bin/lein

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function self_install {
9898
fi
9999
msg "Downloading Leiningen to $LEIN_JAR now..."
100100
mkdir -p "$(dirname "$LEIN_JAR")"
101-
LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip"
101+
LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.jar"
102102
$HTTP_CLIENT "$LEIN_JAR.pending" "$LEIN_URL"
103103
local exit_code=$?
104104
if [ $exit_code == 0 ]; then

bin/lein.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ if not exist %LEIN_INSTALL_DIR% mkdir %LEIN_INSTALL_DIR%
207207

208208
echo Downloading Leiningen now...
209209

210-
set LEIN_JAR_URL=https://github.com/technomancy/leiningen/releases/download/%LEIN_VERSION%/leiningen-%LEIN_VERSION%-standalone.zip
210+
set LEIN_JAR_URL=https://github.com/technomancy/leiningen/releases/download/%LEIN_VERSION%/leiningen-%LEIN_VERSION%-standalone.jar
211211
call :DownloadFile "%LEIN_JAR%.pending" "%LEIN_JAR_URL%"
212212
SET RC=%ERRORLEVEL%
213213
if not %RC% == 0 goto DOWNLOAD_FAILED

bin/lein.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function Install-Self
102102
$jardir = ([IO.FileInfo]$env:LEIN_JAR).Directory.FullName
103103
if(!(Test-Path $jardir -PathType Container)) {mkdir $jardir |Out-Null}
104104
@{ # splatting Invoke-WebRequest due to long URI
105-
Uri = "https://github.com/technomancy/leiningen/releases/download/$env:LEIN_VERSION/leiningen-$env:LEIN_VERSION-standalone.zip"
105+
Uri = "https://github.com/technomancy/leiningen/releases/download/$env:LEIN_VERSION/leiningen-$env:LEIN_VERSION-standalone.jar"
106106
OutFile = $env:LEIN_JAR
107107
} |% {Write-Progress 'Install-Self' $_.Uri -CurrentOperation "Downloading to $env:LEIN_JAR" ; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest @_}
108108
Write-Progress 'Install-Self' -Completed

bin/release

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ git commit -a -m "Release $RELEASE_VERSION"
8080
git tag -s $RELEASE_VERSION -m "Release $RELEASE_VERSION"
8181
git push && git push --tags && git push origin master:stable
8282

83-
echo "Upload $SELF_INSTALL_JAR and $SELF_INSTALL_JAR.asc to GitHub"
84-
echo "but rename the jar to .zip first to work around GitHub foolishness."
83+
echo "Upload $SELF_INSTALL_JAR and $SELF_INSTALL_JAR.asc to GitHub."
8584
echo "https://github.com/technomancy/leiningen/releases/tag/$RELEASE_VERSION"
8685
echo "Copy this version's section of NEWS.md to the GitHub release description."
8786

0 commit comments

Comments
 (0)