Compare commits
12 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ed99f78ec9 | |||
| 588a425e2c | |||
| 7e577d641c | |||
| 42e9f2e865 | |||
| 8b74afd8d0 | |||
| b679a9e1a2 | |||
| 28b571817c | |||
| be17563131 | |||
| 8c578e46a4 | |||
| 13081b4d4a | |||
| 57f734c41a | |||
| a8fb33fa9f |
6 changed files with 186 additions and 49 deletions
165
.forgejo/workflows/release.yml
Normal file
165
.forgejo/workflows/release.yml
Normal file
|
|
@ -0,0 +1,165 @@
|
||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: rust:bookworm
|
||||||
|
volumes:
|
||||||
|
- /opt/runner/keys:/keys:ro
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Install tools
|
||||||
|
run: |
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y dpkg-dev git curl openssh-client
|
||||||
|
|
||||||
|
- name: Setup SSH
|
||||||
|
run: |
|
||||||
|
test -r /keys/forgejo_runner || { echo "Deploy key /keys/forgejo_runner chybi"; exit 1; }
|
||||||
|
install -m 600 /keys/forgejo_runner /tmp/forgejo_runner
|
||||||
|
echo "GIT_SSH_COMMAND=ssh -p 554 -i /tmp/forgejo_runner -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Checkout source
|
||||||
|
run: |
|
||||||
|
git clone ssh://git@git-ssh.janvete.com:554/seth/lines.git src
|
||||||
|
cd src
|
||||||
|
git checkout "${{ github.ref_name }}"
|
||||||
|
|
||||||
|
- name: Build Linux release binary and .deb
|
||||||
|
working-directory: src
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
VER=${VERSION#v}
|
||||||
|
mkdir -p dist
|
||||||
|
|
||||||
|
cargo build --release
|
||||||
|
|
||||||
|
# .deb package
|
||||||
|
DEB_DIR="lines_${VER}_amd64"
|
||||||
|
mkdir -p "${DEB_DIR}/DEBIAN" "${DEB_DIR}/usr/bin"
|
||||||
|
cp target/release/lines "${DEB_DIR}/usr/bin/lines"
|
||||||
|
chmod 755 "${DEB_DIR}/usr/bin/lines"
|
||||||
|
|
||||||
|
cat > "${DEB_DIR}/DEBIAN/control" << CONTROL
|
||||||
|
Package: lines
|
||||||
|
Version: ${VER}
|
||||||
|
Section: utils
|
||||||
|
Priority: optional
|
||||||
|
Architecture: amd64
|
||||||
|
Maintainer: janvete <jan.vete@example.com>
|
||||||
|
Description: TUI for running frequently used commands from markdown files
|
||||||
|
CONTROL
|
||||||
|
|
||||||
|
dpkg-deb --build "${DEB_DIR}" "dist/${DEB_DIR}.deb"
|
||||||
|
|
||||||
|
# Linux tarball
|
||||||
|
STAGING=$(mktemp -d)
|
||||||
|
cp target/release/lines "${STAGING}/lines"
|
||||||
|
tar -czf "dist/lines-${VERSION}-linux-amd64.tar.gz" -C "${STAGING}" lines
|
||||||
|
rm -rf "${STAGING}"
|
||||||
|
|
||||||
|
- name: Print checksums
|
||||||
|
working-directory: src
|
||||||
|
run: |
|
||||||
|
echo "=== SHA256 checksums ==="
|
||||||
|
sha256sum dist/*
|
||||||
|
|
||||||
|
- name: Create Forgejo Release
|
||||||
|
working-directory: src
|
||||||
|
env:
|
||||||
|
FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
|
||||||
|
FORGEJO_URL: https://git.janvete.com
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
API="${FORGEJO_URL}/api/v1/repos/seth/lines"
|
||||||
|
|
||||||
|
RELEASE_JSON=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-X POST \
|
||||||
|
-d "{\"tag_name\":\"${VERSION}\",\"name\":\"${VERSION}\",\"draft\":false,\"prerelease\":false}" \
|
||||||
|
"${API}/releases")
|
||||||
|
|
||||||
|
echo "Create release response: ${RELEASE_JSON}"
|
||||||
|
RELEASE_ID=$(echo "${RELEASE_JSON}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
||||||
|
|
||||||
|
if [ -z "${RELEASE_ID}" ]; then
|
||||||
|
echo "Release may already exist, fetching existing release..."
|
||||||
|
EXISTING=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
||||||
|
"${API}/releases/tags/${VERSION}")
|
||||||
|
echo "Existing release response: ${EXISTING}"
|
||||||
|
RELEASE_ID=$(echo "${EXISTING}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${RELEASE_ID}" ]; then
|
||||||
|
echo "Failed to create or fetch release"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
for ARCHIVE in dist/*; do
|
||||||
|
[ -e "${ARCHIVE}" ] || continue
|
||||||
|
NAME=$(basename "${ARCHIVE}")
|
||||||
|
case "${NAME}" in
|
||||||
|
*.tar.gz) CONTENT_TYPE="application/gzip" ;;
|
||||||
|
*.deb) CONTENT_TYPE="application/vnd.debian.binary-package" ;;
|
||||||
|
*) CONTENT_TYPE="application/octet-stream" ;;
|
||||||
|
esac
|
||||||
|
curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
||||||
|
-H "Content-Type: ${CONTENT_TYPE}" \
|
||||||
|
--data-binary "@${ARCHIVE}" \
|
||||||
|
"${API}/releases/${RELEASE_ID}/assets?name=${NAME}"
|
||||||
|
echo "Uploaded ${NAME}"
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: Update APT repository
|
||||||
|
working-directory: src
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
|
||||||
|
git clone ssh://git@git-ssh.janvete.com:554/seth/apt.git apt-repo
|
||||||
|
cp dist/*.deb apt-repo/
|
||||||
|
|
||||||
|
cd apt-repo
|
||||||
|
|
||||||
|
# Remove any corrupted .deb files left from previous failed runs
|
||||||
|
for f in *.deb; do
|
||||||
|
[ -e "$f" ] || continue
|
||||||
|
if ! dpkg-deb -I "$f" >/dev/null 2>&1; then
|
||||||
|
echo "Removing corrupted package: $f"
|
||||||
|
rm -f "$f"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
dpkg-scanpackages . > Packages
|
||||||
|
gzip -k -f Packages
|
||||||
|
|
||||||
|
cat > Release << RELEASE
|
||||||
|
Origin: janvete
|
||||||
|
Label: janvete
|
||||||
|
Suite: stable
|
||||||
|
Codename: stable
|
||||||
|
Version: 1.0
|
||||||
|
Architectures: amd64
|
||||||
|
Components: main
|
||||||
|
Description: janvete tools APT repository
|
||||||
|
Date: $(date -Ru)
|
||||||
|
RELEASE
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "SHA256:"
|
||||||
|
for f in Packages Packages.gz *.deb; do
|
||||||
|
[ -e "$f" ] || continue
|
||||||
|
printf " %s %16d %s\n" "$(sha256sum "$f" | cut -d' ' -f1)" "$(stat -c%s "$f")" "$f"
|
||||||
|
done
|
||||||
|
} >> Release
|
||||||
|
|
||||||
|
git config user.email "forgejo-actions[bot]@janvete.com"
|
||||||
|
git config user.name "forgejo-actions[bot]"
|
||||||
|
git add -A
|
||||||
|
git commit -m "chore: add lines ${VERSION}"
|
||||||
|
git push
|
||||||
34
.github/workflows/release.yml
vendored
34
.github/workflows/release.yml
vendored
|
|
@ -1,34 +0,0 @@
|
||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-deb:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install Rust
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
|
|
||||||
- name: Install cargo-deb
|
|
||||||
run: cargo install cargo-deb
|
|
||||||
|
|
||||||
- name: Build release binary
|
|
||||||
run: cargo build --release
|
|
||||||
|
|
||||||
- name: Build .deb package
|
|
||||||
run: cargo deb --no-build
|
|
||||||
|
|
||||||
- name: Upload .deb to release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
files: target/debian/*.deb
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -825,7 +825,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lines"
|
name = "lines"
|
||||||
version = "0.1.20"
|
version = "0.1.21"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
[package]
|
[package]
|
||||||
name = "lines"
|
name = "lines"
|
||||||
version = "0.1.20"
|
version = "0.1.21"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
authors = ["janvete"]
|
authors = ["janvete"]
|
||||||
description = "TUI for running frequently used commands"
|
description = "TUI for running frequently used commands"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/janvete/lines"
|
repository = "https://git.janvete.com/seth/lines"
|
||||||
homepage = "https://github.com/janvete/lines"
|
homepage = "https://git.janvete.com/seth/lines"
|
||||||
keywords = ["cli", "tui", "ssh", "commands"]
|
keywords = ["cli", "tui", "ssh", "commands"]
|
||||||
categories = ["command-line-utilities"]
|
categories = ["command-line-utilities"]
|
||||||
|
|
||||||
|
|
|
||||||
14
README.md
14
README.md
|
|
@ -7,24 +7,22 @@ A TUI app for quickly running frequently used commands — ideal for SSH scripts
|
||||||
### macOS (Homebrew)
|
### macOS (Homebrew)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew tap janvete/tools
|
brew tap janvete/tools https://git.janvete.com/seth/homebrew-tools.git
|
||||||
brew install lines
|
brew install lines
|
||||||
```
|
```
|
||||||
|
|
||||||
### Debian / Ubuntu (.deb)
|
### Debian / Ubuntu (APT)
|
||||||
|
|
||||||
Download the latest `.deb` from the [GitHub Releases](https://github.com/janvete/lines/releases) page and install it:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt install ./lines_*.deb
|
echo "deb [trusted=yes] https://git.janvete.com/seth/apt/raw/branch/main ./" | sudo tee /etc/apt/sources.list.d/janvete.list
|
||||||
# or
|
sudo apt update
|
||||||
sudo dpkg -i lines_*.deb
|
sudo apt install lines
|
||||||
```
|
```
|
||||||
|
|
||||||
### From source
|
### From source
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cargo install --git https://github.com/janvete/lines
|
cargo install --git ssh://git@git-ssh.janvete.com:554/seth/lines
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
|
||||||
14
src/main.rs
14
src/main.rs
|
|
@ -14,7 +14,9 @@ use std::time::Duration;
|
||||||
|
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use crossterm::{
|
use crossterm::{
|
||||||
event::{DisableMouseCapture, EnableMouseCapture},
|
event::{
|
||||||
|
DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
|
||||||
|
},
|
||||||
execute,
|
execute,
|
||||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||||
};
|
};
|
||||||
|
|
@ -54,7 +56,12 @@ fn main() -> io::Result<()> {
|
||||||
|
|
||||||
enable_raw_mode()?;
|
enable_raw_mode()?;
|
||||||
let mut stdout = io::stdout();
|
let mut stdout = io::stdout();
|
||||||
execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
|
execute!(
|
||||||
|
stdout,
|
||||||
|
EnterAlternateScreen,
|
||||||
|
EnableMouseCapture,
|
||||||
|
EnableBracketedPaste
|
||||||
|
)?;
|
||||||
let backend = CrosstermBackend::new(stdout);
|
let backend = CrosstermBackend::new(stdout);
|
||||||
let mut terminal = Terminal::new(backend)?;
|
let mut terminal = Terminal::new(backend)?;
|
||||||
|
|
||||||
|
|
@ -64,7 +71,8 @@ fn main() -> io::Result<()> {
|
||||||
execute!(
|
execute!(
|
||||||
terminal.backend_mut(),
|
terminal.backend_mut(),
|
||||||
LeaveAlternateScreen,
|
LeaveAlternateScreen,
|
||||||
DisableMouseCapture
|
DisableMouseCapture,
|
||||||
|
DisableBracketedPaste
|
||||||
)?;
|
)?;
|
||||||
terminal.show_cursor()?;
|
terminal.show_cursor()?;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue