Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/release/web-README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ZebraPrintLab web build (self-hosted)
# ZPLab web build (self-hosted)

Static single-page app. Serve this folder with any web server; no backend required.

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
if [ -z "$ID" ]; then
ID=$(gh api -X POST "repos/$GITHUB_REPOSITORY/releases" \
-f tag_name="$TAG" \
-f name="ZebraPrintLab $TAG" \
-f name="ZPLab $TAG" \
-f body="See the assets to download this version and install." \
-F draft=true --jq .id)
fi
Expand Down Expand Up @@ -161,12 +161,12 @@ jobs:
- name: zip browser build
run: |
cd dist
zip -r "../ZebraPrintLab_${{ needs.gates.outputs.version }}_web.zip" .
zip -r "../ZPLab_${{ needs.gates.outputs.version }}_web.zip" .

- name: upload to draft release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
# gh resolves the tag to the draft release even though the git ref
# does not exist until the release is published
run: gh release upload "v${{ needs.gates.outputs.version }}" "ZebraPrintLab_${{ needs.gates.outputs.version }}_web.zip" --clobber
run: gh release upload "v${{ needs.gates.outputs.version }}" "ZPLab_${{ needs.gates.outputs.version }}_web.zip" --clobber
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ZebraPrintLab</title>
<title>ZPLab</title>
<script>
// Set data-theme before first paint so the user's persisted preference
// applies before React mounts. Without this, a light-theme user sees
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zebra-print-lab"
version = "0.1.0"
description = "ZebraPrintLab desktop shell"
description = "ZPLab desktop shell"
authors = ["u8array"]
license = "MIT"
repository = "https://github.com/u8array/ZebraPrintLab"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/credentials.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::transport::blocking;

/// Keychain service name; the credential name (e.g. "labelary-api-key") is
/// the account under it.
const SERVICE: &str = "ZebraPrintLab";
const SERVICE: &str = "ZPLab";
Comment thread
u8array marked this conversation as resolved.

fn entry(name: &str) -> Result<Entry, String> {
Entry::new(SERVICE, name).map_err(|e| e.to_string())
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/src/usb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ pub async fn send_zpl_usb(device: String, zpl: String) -> Result<UsbSendResult,
// One source of truth for the rule text: the packaged file is embedded so the
// pkexec path and the package payload never drift.
#[cfg(target_os = "linux")]
const UDEV_RULE: &str = include_str!("../packaging/udev/70-zebraprintlab.rules");
const UDEV_RULE: &str = include_str!("../packaging/udev/70-zplab.rules");

#[cfg(target_os = "linux")]
#[tauri::command]
Expand All @@ -415,7 +415,7 @@ pub async fn setup_usb_access() -> Result<(), String> {
// (writable on immutable distros, and the right place for a runtime rule);
// set -e so a failed install is reported instead of silently swallowed.
let script = format!(
"set -e\ninstall -Dm644 /dev/stdin /etc/udev/rules.d/70-zebraprintlab.rules <<'ZEBRA_UDEV_RULE_EOF'\n{UDEV_RULE}\nZEBRA_UDEV_RULE_EOF\nrm -f /usr/lib/udev/rules.d/99-zebraprintlab.rules /etc/udev/rules.d/99-zebraprintlab.rules || true\nudevadm control --reload-rules || true\nudevadm trigger --subsystem-match=usbmisc --subsystem-match=usb || true"
"set -e\ninstall -Dm644 /dev/stdin /etc/udev/rules.d/70-zplab.rules <<'ZEBRA_UDEV_RULE_EOF'\n{UDEV_RULE}\nZEBRA_UDEV_RULE_EOF\nrm -f /usr/lib/udev/rules.d/99-zebraprintlab.rules /etc/udev/rules.d/99-zebraprintlab.rules /etc/udev/rules.d/70-zebraprintlab.rules /usr/lib/udev/rules.d/70-zebraprintlab.rules || true\nudevadm control --reload-rules || true\nudevadm trigger --subsystem-match=usbmisc --subsystem-match=usb || true"
);
blocking(move || {
let status = std::process::Command::new("pkexec")
Expand Down
12 changes: 6 additions & 6 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "ZebraPrintLab",
"productName": "ZPLab",
"version": "../package.json",
"mainBinaryName": "ZebraPrintLab",
"identifier": "de.u8array.zebraprintlab",
"mainBinaryName": "ZPLab",
"identifier": "de.u8array.zplab",
Comment thread
u8array marked this conversation as resolved.
"build": {
"frontendDist": "../dist",
"devUrl": "http://localhost:5173",
Expand All @@ -14,7 +14,7 @@
"windows": [
{
"label": "main",
"title": "ZebraPrintLab",
"title": "ZPLab",
"width": 1280,
"height": 832,
"minWidth": 900,
Expand Down Expand Up @@ -57,13 +57,13 @@
"linux": {
"deb": {
"files": {
"/usr/lib/udev/rules.d/70-zebraprintlab.rules": "packaging/udev/70-zebraprintlab.rules"
"/usr/lib/udev/rules.d/70-zplab.rules": "packaging/udev/70-zplab.rules"
},
"postInstallScript": "packaging/linux/postinst"
},
"rpm": {
"files": {
"/usr/lib/udev/rules.d/70-zebraprintlab.rules": "packaging/udev/70-zebraprintlab.rules"
"/usr/lib/udev/rules.d/70-zplab.rules": "packaging/udev/70-zplab.rules"
},
"postInstallScript": "packaging/linux/postinst"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export function AppShell() {
onClick={() => selectObject(null)}
className="text-accent font-semibold tracking-tight text-sm hover:opacity-75 transition-opacity"
>
Zebra Print Lab
ZPLab
</button>
<span className="text-border-2 select-none">·</span>
<span className="font-mono text-xs text-muted">
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useNativeMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ async function rebuildMenu(structureKey: string, d: MenuData, gen: number): Prom
// a leading app submenu (standard items + Quit) or File gets swallowed.
const appSub = isMacDesktop
? [track(await Submenu.new({
text: 'ZebraPrintLab',
text: 'ZPLab',
items: [
track(await PredefinedMenuItem.new({ item: { About: null } })),
track(await PredefinedMenuItem.new({ item: 'Separator' })),
Expand Down
Loading