Skip to content

LordOS — a free, fast and secure GNU/Linux distribution based on Debian, with its own desktop environment: display server and Wayland compositor in C, a React UI engine on QuickJS, and private native apps.

Website: --remote-desktop hint above the code box so the card bottoms line up; publish install.sh from the last commit only

Federico Pereira78ef634f9131
diff --git a/tools/web/deploy.sh b/tools/web/deploy.sh
index 652ba61..e080579 100755
--- a/tools/web/deploy.sh
+++ b/tools/web/deploy.sh
@@ -18,7 +18,7 @@ DISTRIBUTION=E35DXDFJ83X7Z8
[ -f "$DIST/index.html" ] || { echo "no build in $DIST: run node web/build.mjs" >&2; exit 1; }
[ -f "$DIST/install.sh" ] || { echo "missing $DIST/install.sh" >&2; exit 1; }
-cmp -s "$ROOT/tools/install/install.sh" "$DIST/install.sh" || { echo "dist/install.sh differs from tools/install/install.sh" >&2; exit 1; }
+git -C "$ROOT" show HEAD:tools/install/install.sh | cmp -s - "$DIST/install.sh" || { echo "dist/install.sh differs from the committed tools/install/install.sh" >&2; exit 1; }
[ -f "$DIST/lordos-release.pub.pem" ] || { echo "missing $DIST/lordos-release.pub.pem" >&2; exit 1; }
cmp -s "$ROOT/tools/release/lordos-release.pub.pem" "$DIST/lordos-release.pub.pem" || { echo "dist/lordos-release.pub.pem differs from tools/release/lordos-release.pub.pem" >&2; exit 1; }
if find "$DIST" -name '*.map' | grep -q .; then echo "source maps in $DIST" >&2; exit 1; fi
diff --git a/web/build.mjs b/web/build.mjs
index 5588f36..e3e1b3b 100644
--- a/web/build.mjs
+++ b/web/build.mjs
@@ -809,8 +809,14 @@ write('favicon-512.png', read(r('docs/brand/favicon/favicon-512.png')));
write('apple-touch-icon.png', read(r('docs/brand/favicon/apple-touch-icon-180.png')));
write('social-card.png', read(r('docs/brand/png/social-card-1200x630.png')));
write('lordos-release.pub.pem', read(r('tools/release/lordos-release.pub.pem')));
-write('install.sh', read(r('tools/install/install.sh')));
-execFileSync('cmp', [r('tools/install/install.sh'), path.join(DIST, 'install.sh')]); // throws if they differ
+// install.sh is published from the last commit, never from uncommitted edits in the working tree
+let installSh = read(r('tools/install/install.sh'));
+try {
+ const committed = execFileSync('git', ['-C', REPO, 'show', 'HEAD:tools/install/install.sh'], { maxBuffer: 16 << 20 });
+ if (!committed.equals(installSh)) { console.warn('[web] tools/install/install.sh has uncommitted changes: publishing the committed version'); installSh = committed; }
+} catch { /* not a git checkout */ }
+write('install.sh', installSh);
+if (!read(path.join(DIST, 'install.sh')).equals(installSh)) throw new Error('install.sh copy differs');
const secTxt = path.join(CONTENT, 'well-known/security.txt');
if (fs.existsSync(secTxt)) {
const txt = fs.readFileSync(secTxt, 'utf8');
diff --git a/web/src/home.css b/web/src/home.css
index c673c92..73977a7 100644
--- a/web/src/home.css
+++ b/web/src/home.css
@@ -135,6 +135,6 @@ pre::-webkit-scrollbar-thumb,.table::-webkit-scrollbar-thumb{background:#4A4775;
.dl-card .arch{display:flex;gap:6px;margin:-4px 0 2px}
.dl-card .arch span{padding:3px 9px;border-radius:999px;border:1px solid var(--night-line);background:#14132B;color:#C9C6E6;font:600 12px/1.3 var(--mono)}
.dl-card>p:not(.arch):not(.dl-hint){margin-bottom:8px}
-.dl-hint{margin:2px 0 0!important;font-size:13.5px!important;color:var(--night-note)!important}
+.dl-hint{margin:-4px 0 8px!important;font-size:13.5px!important;color:var(--night-note)!important}
.dl-hint a{color:#FFD60A}
.dl-hint code{font:600 13px var(--mono);white-space:nowrap}
diff --git a/web/src/home.html b/web/src/home.html
index a921898..05c5152 100644
--- a/web/src/home.html
+++ b/web/src/home.html
@@ -56,11 +56,11 @@
<h3>{{t.debTitle}}</h3>
<p class="arch"><span>amd64</span><span>arm64</span></p>
<p>{{t.debText}}</p>
+<p class="dl-hint">{{t.debHintA}} <a href="{{{faqServer}}}"><code>--remote-desktop</code></a> {{t.debHintB}}</p>
<div class="cmd">
<div class="cmd-bar"><span class="cmd-t" aria-hidden="true"><i></i><i></i><i></i>shell</span><button type="button" class="copy" data-copy="install-cmd" data-done="{{t.copied}}" aria-label="{{t.copyCmdLabel}}" hidden>{{t.copy}}</button></div>
<pre id="install-cmd" tabindex="0">curl -fsSL https://lordos.org/install.sh | sh</pre>
</div>
-<p class="dl-hint">{{t.debHintA}} <a href="{{{faqServer}}}"><code>--remote-desktop</code></a> {{t.debHintB}}</p>
</article>
</div>
<div class="verify">