Compare commits

3 Commits
latest ... main

Author SHA1 Message Date
brasse
45307cd8f5 Don't panic on broken pipe (e.g. npmctl list-hosts | head)
All checks were successful
release / build-release (push) Successful in 11m9s
Reset SIGPIPE to SIG_DFL at startup so writing to a closed stdout
terminates the process quietly like normal Unix tools, instead of
panicking with "failed printing to stdout: Broken pipe".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011YPrEZVBpPVoCRyJz2exkZ
2026-07-04 16:33:55 +02:00
brasse
1d71265b84 CI: fix release-notes heredoc breaking workflow YAML
All checks were successful
release / build-release (push) Successful in 3m48s
The inline heredoc for the release body put unindented lines (backticks,
fences) at column 1 inside the `run: |` block scalar, which is invalid
YAML — so Gitea silently scheduled no run. Move the release notes to
.gitea/release-notes.md and cat it instead.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011YPrEZVBpPVoCRyJz2exkZ
2026-07-04 14:42:24 +02:00
brasse
e45fb9b4fd Add one-line installer + install.sh, richer release notes
install.sh detects arch, downloads the latest binary and installs it to PATH
(like a `curl … | sh` installer). The release workflow now ships install.sh as
an asset and PATCHes the release body with the one-line install command, so the
release page shows how to install with a single command. README/wiki updated.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011YPrEZVBpPVoCRyJz2exkZ
2026-07-04 14:38:27 +02:00
7 changed files with 120 additions and 7 deletions

10
.gitea/release-notes.md Normal file
View File

@@ -0,0 +1,10 @@
`npmctl` — CLI för Nginx Proxy Manager (NPM) med sudo-liknande token-auth (lösenordet sparas aldrig, bara en kortlivad token) och en generisk `api`-funktion för vilket HTTP-API som helst.
**Installera (en rad):**
```
curl -fsSL https://gitea.brasse-pc.eu/brasse/Npm-cli/raw/branch/main/install.sh | sh
```
Eller ladda ner rätt binär nedan (`npmctl-linux-x64` / `npmctl-linux-arm64`), `chmod +x` och lägg i PATH. Verifiera mot `checksums.txt`.
📖 Guide: https://gitea.brasse-pc.eu/brasse/Npm-cli/wiki

View File

@@ -63,8 +63,9 @@ jobs:
cargo build --release --target x86_64-unknown-linux-gnu
cp target/x86_64-unknown-linux-gnu/release/npmctl dist/npmctl-linux-x64
cp install.sh dist/install.sh
cd dist
sha256sum npmctl-linux-* > checksums.txt
sha256sum npmctl-linux-* install.sh > checksums.txt
ls -la
- name: Skapa Gitea-release + ladda upp assets
@@ -76,11 +77,15 @@ jobs:
run: |
set -eu
B=dist
BODY="npmctl $TAG — CLI för Nginx Proxy Manager (linux x64/arm64). Se wiki: https://gitea.brasse-pc.eu/brasse/Npm-cli/wiki"
rid=$(curl -s -X POST "$API/repos/$REPO/releases" -H "Authorization: token $TOKEN" -H 'Content-Type: application/json' -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"body\":\"$BODY\"}" | jq -r '.id // empty')
BODY=$(cat "$GITHUB_WORKSPACE/.gitea/release-notes.md")
payload=$(jq -n --arg tag "$TAG" --arg body "$BODY" '{tag_name:$tag,name:$tag,body:$body}')
rid=$(curl -s -X POST "$API/repos/$REPO/releases" -H "Authorization: token $TOKEN" -H 'Content-Type: application/json' -d "$payload" | jq -r '.id // empty')
[ -z "$rid" ] && rid=$(curl -s "$API/repos/$REPO/releases/tags/$TAG" -H "Authorization: token $TOKEN" | jq -r '.id')
echo "release id: $rid"
for f in npmctl-linux-x64 npmctl-linux-arm64 checksums.txt; do
# Uppdatera namn/beskrivning även om releasen redan fanns (rullande 'latest').
curl -s -X PATCH "$API/repos/$REPO/releases/$rid" -H "Authorization: token $TOKEN" -H 'Content-Type: application/json' \
-d "$(jq -n --arg tag "$TAG" --arg body "$BODY" '{name:$tag,body:$body}')" -o /dev/null
for f in npmctl-linux-x64 npmctl-linux-arm64 install.sh checksums.txt; do
aid=$(curl -s "$API/repos/$REPO/releases/$rid/assets" -H "Authorization: token $TOKEN" | jq -r ".[] | select(.name==\"$f\") | .id")
if [ -n "$aid" ] && [ "$aid" != "null" ]; then
echo "ersätter befintlig $f (id $aid)"

1
Cargo.lock generated
View File

@@ -629,6 +629,7 @@ dependencies = [
"chrono",
"clap",
"dirs",
"libc",
"reqwest",
"rpassword",
"serde",

View File

@@ -21,6 +21,9 @@ dirs = "5"
anyhow = "1"
chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
[target.'cfg(unix)'.dependencies]
libc = "0.2"
[profile.release]
strip = true
opt-level = "z"

View File

@@ -11,12 +11,19 @@ lösenordet sparas aldrig.
👉 **Användning och alla kommandon:** se [wiki:n](https://gitea.brasse-pc.eu/brasse/Npm-cli/wiki).
## Installera (färdig binär)
## Installera
Hämta senaste binär från [releases](https://gitea.brasse-pc.eu/brasse/Npm-cli/releases):
En rad (hämtar senaste binär för din arkitektur och lägger den i PATH):
```sh
curl -fsSL https://gitea.brasse-pc.eu/brasse/Npm-cli/raw/branch/main/install.sh | sh
```
Miljövariabler: `NPMCTL_INSTALL_DIR` (installkatalog), `NPMCTL_VERSION` (release-tag).
Eller manuellt från [releases](https://gitea.brasse-pc.eu/brasse/Npm-cli/releases):
```sh
# välj arkitektur: x64 eller arm64
curl -fsSL -o npmctl https://gitea.brasse-pc.eu/brasse/Npm-cli/releases/download/latest/npmctl-linux-x64
chmod +x npmctl && sudo mv npmctl /usr/local/bin/
npmctl --help

79
install.sh Normal file
View File

@@ -0,0 +1,79 @@
#!/bin/sh
# npmctl-installerare — hämtar senaste binär och lägger den i PATH med ETT kommando:
#
# curl -fsSL https://gitea.brasse-pc.eu/brasse/Npm-cli/raw/branch/main/install.sh | sh
#
# Miljövariabler:
# NPMCTL_INSTALL_DIR installationskatalog (standard: /usr/local/bin, annars ~/.local/bin)
# NPMCTL_VERSION release-tag att hämta (standard: latest)
set -eu
REPO="https://gitea.brasse-pc.eu/brasse/Npm-cli"
VERSION="${NPMCTL_VERSION:-latest}"
BIN="npmctl"
info() { printf '\033[1;34m==>\033[0m %s\n' "$*"; }
err() { printf '\033[1;31mfel:\033[0m %s\n' "$*" >&2; exit 1; }
# --- OS/arch ---
[ "$(uname -s)" = "Linux" ] || err "endast Linux stöds (hittade $(uname -s))"
case "$(uname -m)" in
x86_64|amd64) ASSET="npmctl-linux-x64" ;;
aarch64|arm64) ASSET="npmctl-linux-arm64" ;;
*) err "arkitektur stöds ej: $(uname -m)" ;;
esac
# --- verktyg ---
if command -v curl >/dev/null 2>&1; then DL="curl -fsSL -o"; else
command -v wget >/dev/null 2>&1 || err "behöver curl eller wget"
DL="wget -qO"
fi
# --- installationskatalog ---
DEST="${NPMCTL_INSTALL_DIR:-}"
if [ -z "$DEST" ]; then
if [ "$(id -u)" -eq 0 ] || [ -w /usr/local/bin ]; then
DEST="/usr/local/bin"
else
DEST="$HOME/.local/bin"
fi
fi
mkdir -p "$DEST" 2>/dev/null || true
URL="$REPO/releases/download/$VERSION/$ASSET"
TMP="$(mktemp)"
trap 'rm -f "$TMP"' EXIT
info "Hämtar $ASSET ($VERSION) …"
$DL "$TMP" "$URL" || err "nedladdning misslyckades: $URL"
chmod +x "$TMP"
# --- placera binären (med sudo vid behov) ---
TARGET="$DEST/$BIN"
if mv "$TMP" "$TARGET" 2>/dev/null; then
:
elif command -v sudo >/dev/null 2>&1; then
info "Behöver rättigheter för $DEST — använder sudo"
sudo mv "$TMP" "$TARGET" && sudo chmod +x "$TARGET"
else
err "kan inte skriva till $DEST (kör som root, använd sudo, eller sätt NPMCTL_INSTALL_DIR)"
fi
trap - EXIT
info "Installerat: $TARGET"
"$TARGET" --version || true
case ":$PATH:" in
*":$DEST:"*) ;;
*) info "OBS: $DEST ligger inte i PATH. Lägg till: export PATH=\"$DEST:\$PATH\"" ;;
esac
cat <<EOF
Kom igång:
$BIN --base-url http://127.0.0.1:81 login # skriv lösenord en gång (cachas som token)
$BIN list-hosts
$BIN --help
Guide: $REPO/wiki
EOF

View File

@@ -14,6 +14,14 @@ use client::NpmClient;
use config::{resolve_base_url, Paths};
fn main() {
// Bete oss som vanliga Unix-verktyg när stdout stängs tidigt (t.ex. `| head`):
// återställ SIGPIPE till default så processen avslutas tyst i stället för att
// panika på "Broken pipe" i println!.
#[cfg(unix)]
unsafe {
libc::signal(libc::SIGPIPE, libc::SIG_DFL);
}
// Egen parse-hantering: vid felaktig input skriver vi ut hjälpen
// (utöver felmeddelandet), enligt önskemål. --help/--version skrivs ut normalt.
let cli = match Cli::try_parse() {