diff --git a/Cargo.toml b/Cargo.toml index e59db5f..8317ec6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" edition = "2021" license = "GPL-3.0-or-later" authors = ["xscriptor"] -repository = "https://github.com/xscriptor/xpm" +repository = "https://github.com/xlnux/xpm" description = "Modern Rust-based package manager for X Distribution" [workspace.dependencies] diff --git a/README.md b/README.md index dc9ff3d..b34adb3 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@

License Rust - Version - CI + Version + CI Status

@@ -41,7 +41,7 @@

Overview

-

xpm is a native Rust replacement for pacman and libalpm, designed for the X distribution. It uses the .xp package format (X Package) natively and maintains compatibility with Arch Linux .pkg.tar.zst packages. Packages are built with xpkg, the companion builder tool.

+

xpm is a native Rust replacement for pacman and libalpm, designed for the X distribution. It uses the .xp package format (X Package) natively and maintains compatibility with Arch Linux .pkg.tar.zst packages. Packages are built with xpkg, the companion builder tool.

Key Features

@@ -61,12 +61,12 @@

Install the latest published xpm build directly from the official repository:

-
curl -fsSL https://raw.githubusercontent.com/xscriptor/xpm/main/install.sh | bash
+
curl -fsSL https://raw.githubusercontent.com/xlnux/xpm/main/install.sh | bash
 

If curl is not available:

-
wget -qO- https://raw.githubusercontent.com/xscriptor/xpm/main/install.sh | bash
+
wget -qO- https://raw.githubusercontent.com/xlnux/xpm/main/install.sh | bash
 

Optional environment variables for the installer:

@@ -78,13 +78,13 @@

Example:

-
INSTALL_PREFIX=/usr XPM_PKG_URL="https://xscriptor.github.io/x-repo/x/x86_64/xpm-0.1.0-3-x86_64.xp" \
-curl -fsSL https://raw.githubusercontent.com/xscriptor/xpm/main/install.sh | bash
+
INSTALL_PREFIX=/usr XPM_PKG_URL="https://xlnux.github.io/x-repo/x/x86_64/xpm-0.1.0-3-x86_64.xp" \
+curl -fsSL https://raw.githubusercontent.com/xlnux/xpm/main/install.sh | bash
 

Build From Source

-
git clone https://github.com/xscriptor/xpm.git
+
git clone https://github.com/xlnux/xpm.git
 cd xpm
 cargo build --release
 sudo cp target/release/xpm /usr/local/bin/
@@ -225,7 +225,7 @@ parallel_downloads = 5
 [[repo]]
 name = "x"
 server = [
-        "https://xscriptor.github.io/x-repo/x/$arch",
+        "https://xlnux.github.io/x-repo/x/$arch",
 ]
 
@@ -240,12 +240,12 @@ sudo install -d -m 755 /etc/xpm/gnupg # Download repository public keyring sudo curl -fsSL \ - https://xscriptor.github.io/x-repo/x/x86_64/trustedkeys.gpg \ + https://xlnux.github.io/x-repo/x/x86_64/trustedkeys.gpg \ -o /etc/xpm/gnupg/trustedkeys.gpg # Optional: keep the ASCII-armored public key for auditing sudo curl -fsSL \ - https://xscriptor.github.io/x-repo/x/x86_64/signing.pub \ + https://xlnux.github.io/x-repo/x/x86_64/signing.pub \ -o /etc/xpm/gnupg/signing.pub
@@ -260,7 +260,7 @@ sig_level = "required"
[[repo]]
 name = "x"
-server = ["https://xscriptor.github.io/x-repo/x/$arch"]
+server = ["https://xlnux.github.io/x-repo/x/$arch"]
 sig_level = "required"
 
@@ -272,9 +272,9 @@ sig_level = "required" sudo install -d -m 755 /etc/xpm/gnupg # 2) Import published keyring + public key -sudo curl -fsSL https://xscriptor.github.io/x-repo/x/x86_64/trustedkeys.gpg \ +sudo curl -fsSL https://xlnux.github.io/x-repo/x/x86_64/trustedkeys.gpg \ -o /etc/xpm/gnupg/trustedkeys.gpg -sudo curl -fsSL https://xscriptor.github.io/x-repo/x/x86_64/signing.pub \ +sudo curl -fsSL https://xlnux.github.io/x-repo/x/x86_64/signing.pub \ -o /etc/xpm/gnupg/signing.pub # 3) Confirm /etc/xpm.conf points to x endpoint and required signatures @@ -289,7 +289,7 @@ parallel_downloads = 5 [[repo]] name = "x" -server = ["https://xscriptor.github.io/x-repo/x/$arch"] +server = ["https://xlnux.github.io/x-repo/x/$arch"] sig_level = "required" EOF @@ -318,7 +318,7 @@ sudo xpm install xpkg
  • Package not found:
      -
    • Confirm xpm repository URL is https://xscriptor.github.io/x-repo/x/$arch and not the pacman endpoint under /repo/x86_64.
    • +
    • Confirm xpm repository URL is https://xlnux.github.io/x-repo/x/$arch and not the pacman endpoint under /repo/x86_64.
  • @@ -404,7 +404,7 @@ sudo xpm install xpkg

    Repository Hosting

    -

    The default package repository is hosted on GitHub Pages at xscriptor.github.io/x-repo. This will migrate to the xscriptor organization for consistency as the project grows. xpm supports any HTTP-based static file server, making future migration to a VPS transparent.

    +

    The default package repository is hosted on GitHub Pages at xlnux.github.io/x-repo. This will migrate to the xlnux organization for consistency as the project grows. xpm supports any HTTP-based static file server, making future migration to a VPS transparent.

    Relationship with xpkg

    @@ -508,8 +508,8 @@ xpm repo list

    X

    - X Web + X Web & - X Profile + X Profile

    \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md index e33ecdb..2ce9f4f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -34,5 +34,5 @@ The following are in scope: | Version | Supported | |---------|-----------| -| Latest `main` | ✅ | +| Latest `main` | Yes | | Older releases | Best effort | diff --git a/SUPPORT.md b/SUPPORT.md index ebd0fae..cb3f809 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -9,7 +9,7 @@

    Get Help

    diff --git a/crates/xpm-core/src/config.rs b/crates/xpm-core/src/config.rs index 7b29923..777f8ac 100644 --- a/crates/xpm-core/src/config.rs +++ b/crates/xpm-core/src/config.rs @@ -109,7 +109,7 @@ impl Default for XpmConfig { options: GeneralOptions::default(), repositories: vec![Repository { name: "x".to_string(), - server: vec!["https://xscriptor.github.io/x-repo/x/$arch".into()], + server: vec!["https://xlnux.github.io/x-repo/x/$arch".into()], sig_level: None, }], } diff --git a/crates/xpm-core/src/repo_db.rs b/crates/xpm-core/src/repo_db.rs index 7868c4a..9061693 100644 --- a/crates/xpm-core/src/repo_db.rs +++ b/crates/xpm-core/src/repo_db.rs @@ -269,7 +269,7 @@ mod tests { let bytes = make_gzip_tar(&[ ( "hello-1.0-1/desc", - "%NAME%\nhello\n\n%VERSION%\n1.0-1\n\n%FILENAME%\nhello-1.0-1-x86_64.xp\n\n%SHA256SUM%\nabc123\n\n%URL%\nhttps://github.com/xscriptor/hello\n\n%DESC%\nhello package\n\n%ARCH%\nx86_64\n", + "%NAME%\nhello\n\n%VERSION%\n1.0-1\n\n%FILENAME%\nhello-1.0-1-x86_64.xp\n\n%SHA256SUM%\nabc123\n\n%URL%\nhttps://github.com/xlnux/hello\n\n%DESC%\nhello package\n\n%ARCH%\nx86_64\n", ), ( "hello-1.0-1/depends", @@ -298,7 +298,7 @@ mod tests { assert_eq!(hello.sha256sum.as_deref(), Some("abc123")); assert_eq!( hello.url.as_deref(), - Some("https://github.com/xscriptor/hello") + Some("https://github.com/xlnux/hello") ); assert_eq!(hello.depends, vec!["libc>=2.39"]); assert_eq!(hello.provides, vec!["hello-bin"]); @@ -402,7 +402,7 @@ mod tests { let bytes = make_gzip_tar(&[ ( "xpkg-0.1.0-1/desc", - "%NAME%\nxpkg\n\n%VERSION%\n0.1.0-1\n\n%FILENAME%\nxpkg-0.1.0-1-x86_64.xp\n\n%SHA256SUM%\ndeadbeefcafebabe0000000000000000deadbeefcafebabe0000000000000000\n\n%URL%\nhttps://github.com/xscriptor/xpkg\n\n%DESC%\nX distribution package builder\n\n%ARCH%\nx86_64\n", + "%NAME%\nxpkg\n\n%VERSION%\n0.1.0-1\n\n%FILENAME%\nxpkg-0.1.0-1-x86_64.xp\n\n%SHA256SUM%\ndeadbeefcafebabe0000000000000000deadbeefcafebabe0000000000000000\n\n%URL%\nhttps://github.com/xlnux/xpkg\n\n%DESC%\nX distribution package builder\n\n%ARCH%\nx86_64\n", ), ( "xpkg-0.1.0-1/depends", @@ -424,7 +424,7 @@ mod tests { ); assert_eq!( xpkg.url.as_deref(), - Some("https://github.com/xscriptor/xpkg") + Some("https://github.com/xlnux/xpkg") ); assert_eq!(xpkg.depends, vec!["rust"]); assert_eq!(xpkg.provides, vec!["xpkg-core"]); diff --git a/crates/xpm-core/src/repo_sync.rs b/crates/xpm-core/src/repo_sync.rs index 811728a..88c6ecb 100644 --- a/crates/xpm-core/src/repo_sync.rs +++ b/crates/xpm-core/src/repo_sync.rs @@ -528,7 +528,7 @@ mod tests { fn package_candidates_include_server_and_github_release() { let repo = Repository { name: "x".to_string(), - server: vec!["https://xscriptor.github.io/x-repo/x/$arch".to_string()], + server: vec!["https://xlnux.github.io/x-repo/x/$arch".to_string()], sig_level: None, }; let entry = RepoEntry { @@ -536,16 +536,16 @@ mod tests { version: "0.1.0-1".to_string(), filename: Some("xfetch-0.1.0-1-x86_64.xp".to_string()), sha256sum: None, - url: Some("https://github.com/xscriptor/xfetch".to_string()), + url: Some("https://github.com/xfetch-cli/xfetch".to_string()), ..Default::default() }; let candidates = package_download_candidates(&repo, "x86_64", &entry); assert!(candidates .iter() - .any(|u| u == "https://xscriptor.github.io/x-repo/x/x86_64/xfetch-0.1.0-1-x86_64.xp")); + .any(|u| u == "https://xlnux.github.io/x-repo/x/x86_64/xfetch-0.1.0-1-x86_64.xp")); assert!(candidates .iter() - .any(|u| u == "https://github.com/xscriptor/xfetch/releases/download/xfetch-0.1.0-1/xfetch-0.1.0-1-x86_64.xp")); + .any(|u| u == "https://github.com/xfetch-cli/xfetch/releases/download/xfetch-0.1.0-1/xfetch-0.1.0-1-x86_64.xp")); } } diff --git a/docs/CLI.md b/docs/CLI.md index f2bdb66..0359cc0 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -252,7 +252,7 @@ xpm repo add ```bash xpm repo add chaotic-aur https://cdn-mirror.chaotic.cx/$repo/$arch -xpm repo add x-repo https://xscriptor.github.io/x-repo/$arch +xpm repo add x-repo https://xlnux.github.io/x-repo/$arch ``` #### `repo remove` diff --git a/docs/FETCH_TARGETS.md b/docs/FETCH_TARGETS.md index a23bc40..adeaed5 100644 --- a/docs/FETCH_TARGETS.md +++ b/docs/FETCH_TARGETS.md @@ -36,7 +36,7 @@ Repository URLs support variable substitution for dynamic path construction. https://mirror.rackspace.com/archlinux/$repo/os/$arch # GitHub Pages hosted repository -https://xscriptor.github.io/x-repo/$arch +https://xlnux.github.io/x-repo/$arch # Local mirror file:///srv/repo/$repo/$arch @@ -66,7 +66,7 @@ These repositories are built into xpm and configured in `/etc/xpm.conf`. [[repo]] name = "x-repo" -server = ["https://xscriptor.github.io/x-repo/$arch"] +server = ["https://xlnux.github.io/x-repo/$arch"] sig_level = "optional" [[repo]] diff --git a/etc/xpm.conf.example b/etc/xpm.conf.example index 3eb7bd2..80e875f 100644 --- a/etc/xpm.conf.example +++ b/etc/xpm.conf.example @@ -65,7 +65,7 @@ check_space = true [[repo]] name = "x" server = [ - "https://xscriptor.github.io/x-repo/x/$arch", + "https://xlnux.github.io/x-repo/x/$arch", ] # Optional additional repositories can be appended below. diff --git a/install.sh b/install.sh index b1c6c88..0470528 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -XPM_PKG_URL_DEFAULT="https://xscriptor.github.io/x-repo/x/x86_64/xpm-0.1.0-3-x86_64.xp" +XPM_PKG_URL_DEFAULT="https://xlnux.github.io/x-repo/x/x86_64/xpm-0.1.0-3-x86_64.xp" XPM_PKG_URL="${XPM_PKG_URL:-$XPM_PKG_URL_DEFAULT}" INSTALL_PREFIX="${INSTALL_PREFIX:-/usr/local}" BIN_DEST="$INSTALL_PREFIX/bin/xpm" diff --git a/packaging/xpkg/XBUILD b/packaging/xpkg/XBUILD index 45ad86a..65da7d8 100644 --- a/packaging/xpkg/XBUILD +++ b/packaging/xpkg/XBUILD @@ -3,7 +3,7 @@ name = "xpm" version = "0.1.0" release = 3 description = "Modern Rust-based package manager for X Distribution" -url = "https://github.com/xscriptor/xpm" +url = "https://github.com/xlnux/xpm" license = ["GPL-3.0-or-later"] arch = ["x86_64"]