Skip to content

Commit c67fc77

Browse files
szarnyasgszarnyasg
committed
Add more lts/current installation links
1 parent 7c20121 commit c67fc77

2 files changed

Lines changed: 79 additions & 50 deletions

File tree

‎_includes/installation.html‎

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>Installation <span class="currentversion"></span>
4747
<span class="version-switch" hidden>
4848
<span class="version-switch-label">Version</span>
4949
<span class="version-switch-toggle" role="radiogroup" aria-label="Version selection">
50-
<button class="version-switch-option active" data-version="stable" role="radio" aria-checked="true" type="button">{{ site.current_duckdb_version }} (current)</button>
50+
<button class="version-switch-option active" data-version="current" role="radio" aria-checked="true" type="button">{{ site.current_duckdb_version }} (current)</button>
5151
<button class="version-switch-option" data-version="lts" role="radio" aria-checked="false" type="button">{{ site.lts_duckdb_version }} (LTS)</button>
5252
<span class="version-switch-slider"></span>
5353
</span>
@@ -67,7 +67,7 @@ <h2>Installation <span class="currentversion"></span>
6767

6868

6969
<div class="note">
70-
This page contains links to the latest stable DuckDB version.
70+
This page contains links to the current stable and the LTS DuckDB versions.
7171
For the preview version, please visit the <a href="{% link install/preview.md %}">preview (nightly) installation page</a>.
7272
</div>
7373

@@ -85,7 +85,7 @@ <h2>Installation <span class="currentversion"></span>
8585

8686

8787

88-
<div class="stable"
88+
<div class="current"
8989
data-platform="macos"
9090
data-environment="cli"
9191
data-docs="{% link docs/stable/clients/cli/overview.md %}">
@@ -108,11 +108,6 @@ <h4>Docker Image</h4>
108108
docker run --rm -it -v "$(pwd):/workspace" -w /workspace duckdb/duckdb
109109
{%- endhighlight -%}
110110

111-
<h4>Install Specific Version</h4>
112-
{%- highlight bash -%}
113-
curl https://install.duckdb.org | DUCKDB_VERSION=1.4.3 sh
114-
{%- endhighlight -%}
115-
116111
<h4>Direct Download</h4>
117112
{%- assign f = site.data.checksums_current.artifacts.cli.macos.x86_64.filename -%}
118113
<a href="https://install.duckdb.org/v{{ site.current_duckdb_version }}/{{ f }}" class="download-btn" download="{{ f }}" rel="noopener noreferrer">{{ f }}</a>
@@ -126,8 +121,6 @@ <h4>Direct Download</h4>
126121
data-environment="cli"
127122
data-docs="{% link docs/stable/clients/cli/overview.md %}">
128123

129-
<!-- TODO: Replace with actual LTS installation instructions for CLI macOS -->
130-
131124
{%- highlight bash -%}
132125
curl https://install.duckdb.org | DUCKDB_VERSION={{ site.lts_duckdb_version }} sh
133126
{%- endhighlight -%}
@@ -142,7 +135,7 @@ <h4>Direct Download</h4>
142135
</div>
143136
</div>
144137

145-
<div class="stable"
138+
<div class="current"
146139
data-platform="linux"
147140
data-environment="cli"
148141
data-docs="{% link docs/stable/clients/cli/overview.md %}">
@@ -153,11 +146,6 @@ <h4>Direct Download</h4>
153146

154147
<div class="alternative">
155148

156-
<h4>Install Specific Version</h4>
157-
{%- highlight bash -%}
158-
curl https://install.duckdb.org | DUCKDB_VERSION=1.4.3 sh
159-
{%- endhighlight -%}
160-
161149
<h4>Docker Image</h4>
162150
{%- highlight bash -%}
163151
docker run --rm -it -v "$(pwd):/workspace" -w /workspace duckdb/duckdb
@@ -180,10 +168,8 @@ <h4>Direct Downloads</h4>
180168
data-environment="cli"
181169
data-docs="{% link docs/stable/clients/cli/overview.md %}">
182170

183-
<!-- TODO: Replace with actual LTS installation instructions for CLI Linux -->
184-
185171
{%- highlight bash -%}
186-
TODO
172+
curl https://install.duckdb.org | DUCKDB_VERSION={{ site.lts_duckdb_version }} sh
187173
{%- endhighlight -%}
188174

189175
<div class="alternative">
@@ -201,7 +187,7 @@ <h4>Direct Downloads</h4>
201187
</div>
202188

203189

204-
<div class="stable"
190+
<div class="current"
205191
data-platform="windows"
206192
data-environment="cli"
207193
data-docs="{% link docs/stable/clients/cli/overview.md %}">
@@ -249,32 +235,38 @@ <h4>Docker Image (for WSL2)</h4>
249235
data-environment="cli"
250236
data-docs="{% link docs/stable/clients/cli/overview.md %}">
251237

252-
<!-- TODO: Replace with actual LTS installation instructions for CLI Windows -->
238+
{%- assign f_x86 = site.data.checksums_lts.artifacts.cli.windows.x86_64.filename -%}
239+
<a href="https://install.duckdb.org/v{{ site.lts_duckdb_version }}/{{ f_x86 }}" class="download-btn" download="{{ f_x86 }}" rel="noopener noreferrer">{{ f_x86 }}</a>
240+
{%- include checksum_inline.html environment="cli" platform="windows" architecture="x86_64" version="lts" -%}
253241

254-
{%- highlight bash -%}
255-
TODO
256-
{%- endhighlight -%}
242+
{%- assign f_arm = site.data.checksums_lts.artifacts.cli.windows.arm64.filename -%}
243+
<a href="https://install.duckdb.org/v{{ site.lts_duckdb_version }}/{{ f_arm }}" class="download-btn" download="{{ f_arm }}" rel="noopener noreferrer">{{ f_arm }}</a>
244+
{%- include checksum_inline.html environment="cli" platform="windows" architecture="arm64" version="lts" -%}
257245

258246
<div class="note">
259247
Note that DuckDB on Windows requires the <a href="https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170">Microsoft Visual C++ Redistributable</a>.
260248
</div>
261249

262250
<div class="alternative">
263251

264-
<h4>Direct Downloads</h4>
265-
{%- assign f_x86 = site.data.checksums_lts.artifacts.cli.windows.x86_64.filename -%}
266-
<a href="https://install.duckdb.org/v{{ site.lts_duckdb_version }}/{{ f_x86 }}" class="download-btn" download="{{ f_x86 }}" rel="noopener noreferrer">{{ f_x86 }}</a>
267-
{%- include checksum_inline.html environment="cli" platform="windows" architecture="x86_64" version="lts" -%}
252+
<h4>Package Manager</h4>
268253

269-
{%- assign f_arm = site.data.checksums_lts.artifacts.cli.windows.arm64.filename -%}
270-
<a href="https://install.duckdb.org/v{{ site.lts_duckdb_version }}/{{ f_arm }}" class="download-btn" download="{{ f_arm }}" rel="noopener noreferrer">{{ f_arm }}</a>
271-
{%- include checksum_inline.html environment="cli" platform="windows" architecture="arm64" version="lts" -%}
254+
{%- highlight bash -%}
255+
winget install DuckDB.cli --version {{ site.lts_duckdb_version }}
256+
{%- endhighlight -%}
257+
258+
<h4>Docker Image (for WSL2)</h4>
259+
260+
{%- highlight bash -%}
261+
docker run --rm -it -v "$(pwd):/workspace" -w /workspace duckdb/duckdb:{{ site.lts_duckdb_version }}
262+
{%- endhighlight -%}
272263

273264
</div>
265+
274266
</div>
275267

276268

277-
<div class="stable"
269+
<div class="current"
278270
data-environment="python"
279271
data-docs="{% link docs/stable/clients/python/overview.md %}">
280272

@@ -288,8 +280,22 @@ <h4>Direct Downloads</h4>
288280

289281
</div>
290282

283+
<div class="lts"
284+
data-environment="python"
285+
data-docs="{% link docs/stable/clients/python/overview.md %}">
291286

292-
<div class="stable"
287+
{%- highlight bash -%}
288+
pip install duckdb=={{ site.lts_duckdb_version }}
289+
{%- endhighlight -%}
290+
291+
<div class="note">
292+
Note that DuckDB on Windows requires the <a href="https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170">Microsoft Visual C++ Redistributable</a>.
293+
</div>
294+
295+
</div>
296+
297+
298+
<div class="current"
293299
data-environment="r"
294300
data-docs="{% link docs/stable/clients/r.md %}">
295301

@@ -312,7 +318,30 @@ <h4>Installing from the Posit Public Package Manager (Linux)</h4>
312318
</div>
313319

314320

315-
<div class="stable"
321+
<div class="current"
322+
data-environment="r"
323+
data-docs="{% link docs/stable/clients/r.md %}">
324+
325+
{%- highlight r -%}
326+
install.packages("duckdb", version = "{{ site.lts_duckdb_r_version }}")
327+
{%- endhighlight -%}
328+
329+
<div class="alternative">
330+
331+
<h4>Installing from the Posit Public Package Manager (Linux)</h4>
332+
333+
{%- highlight r -%}
334+
options(HTTPUserAgent = sprintf("R/%s R (%s)",
335+
getRversion(),
336+
paste(getRversion(), R.version["platform"], R.version["arch"], R.version["os"])
337+
))
338+
install.packages("duckdb", version = "{{ site.lts_duckdb_r_version }}", repos="https://p3m.dev/cran/__linux__/manylinux_2_28/latest/")
339+
{%- endhighlight -%}
340+
</div>
341+
</div>
342+
343+
344+
<div class="current"
316345
data-environment="java"
317346
data-docs="{% link docs/stable/clients/java.md %}">
318347

@@ -342,7 +371,7 @@ <h4>Gradle</h4>
342371

343372
</div>
344373

345-
<div class="stable"
374+
<div class="current"
346375
data-environment="nodejs"
347376
data-docs="{% link docs/stable/clients/node_neo/overview.md %}">
348377

@@ -353,7 +382,7 @@ <h4>Gradle</h4>
353382
</div>
354383

355384

356-
<div class="stable"
385+
<div class="current"
357386
data-environment="rust"
358387
data-docs="{% link docs/stable/clients/rust.md %}">
359388

@@ -364,7 +393,7 @@ <h4>Gradle</h4>
364393
</div>
365394

366395

367-
<div class="stable"
396+
<div class="current"
368397
data-environment="go"
369398
data-docs="{% link docs/stable/clients/go.md %}">
370399

@@ -376,7 +405,7 @@ <h4>Gradle</h4>
376405

377406

378407

379-
<div class="stable"
408+
<div class="current"
380409
data-platform="linux"
381410
data-environment="c"
382411
data-docs="{% link docs/stable/clients/c/overview.md %}">
@@ -392,7 +421,7 @@ <h4>Gradle</h4>
392421
</div>
393422

394423

395-
<div class="stable"
424+
<div class="current"
396425
data-platform="macos"
397426
data-environment="c"
398427
data-docs="{% link docs/stable/clients/c/overview.md %}">
@@ -404,7 +433,7 @@ <h4>Gradle</h4>
404433
</div>
405434

406435

407-
<div class="stable"
436+
<div class="current"
408437
data-platform="windows"
409438
data-environment="c"
410439
data-docs="{% link docs/stable/clients/c/overview.md %}">
@@ -422,7 +451,7 @@ <h4>Gradle</h4>
422451

423452

424453

425-
<div class="stable"
454+
<div class="current"
426455
data-platform="linux"
427456
data-environment="odbc"
428457
data-docs="{% link docs/stable/clients/odbc/overview.md %}">
@@ -436,7 +465,7 @@ <h4>Gradle</h4>
436465
</div>
437466

438467

439-
<div class="stable"
468+
<div class="current"
440469
data-platform="macos"
441470
data-environment="odbc"
442471
data-docs="{% link docs/stable/clients/odbc/overview.md %}">
@@ -447,7 +476,7 @@ <h4>Gradle</h4>
447476
</div>
448477

449478

450-
<div class="stable"
479+
<div class="current"
451480
data-platform="windows"
452481
data-environment="odbc"
453482
data-docs="{% link docs/stable/clients/odbc/overview.md %}">

‎js/install.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
var state = {
2626
platform: null,
2727
environment: null,
28-
version: 'stable'
28+
version: 'current'
2929
};
3030

3131
function detectPlatform() {
@@ -54,7 +54,7 @@
5454
state.platform = sanitizeParam(params.get('platform'));
5555
state.environment = sanitizeParam(params.get('environment'));
5656
var v = sanitizeParam(params.get('version'));
57-
if (v === 'lts' || v === 'stable') state.version = v;
57+
if (v === 'lts' || v === 'current') state.version = v;
5858
} catch (e) {}
5959
}
6060

@@ -218,8 +218,8 @@
218218
$versionSwitch.attr('hidden', '');
219219
// Auto-select whichever version is available
220220
var envSel = '[data-environment="' + cssEscape(state.environment) + '"]';
221-
var hasStable = $templates.find(envSel + '.stable').length > 0;
222-
state.version = hasStable ? 'stable' : 'lts';
221+
var hasStable = $templates.find(envSel + '.current').length > 0;
222+
state.version = hasStable ? 'current' : 'lts';
223223
}
224224

225225
$versionBtns.each(function () {
@@ -295,7 +295,7 @@
295295
function bestTemplate() {
296296
var p = state.platform;
297297
var e = state.environment;
298-
var v = state.version || 'stable';
298+
var v = state.version || 'current';
299299

300300
if (!e) return $();
301301

@@ -304,7 +304,7 @@
304304
if ($match.length) return $match;
305305

306306
// Fallback: try the other version (for clients with only one version)
307-
var altV = v === 'stable' ? 'lts' : 'stable';
307+
var altV = v === 'current' ? 'lts' : 'current';
308308
return findTemplate(e, p, altV);
309309
}
310310

@@ -318,7 +318,7 @@
318318

319319
function hasBothVersions(environment) {
320320
var envSel = '[data-environment="' + cssEscape(environment) + '"]';
321-
var hasStable = $templates.find(envSel + '.stable').length > 0;
321+
var hasStable = $templates.find(envSel + '.current').length > 0;
322322
var hasLts = $templates.find(envSel + '.lts').length > 0;
323323
return hasStable && hasLts;
324324
}

0 commit comments

Comments
 (0)