Skip to content

Commit

Permalink
fix: fix renamed github scope (comfysage)
Browse files Browse the repository at this point in the history
  • Loading branch information
comfysage committed Feb 28, 2024
1 parent a09e4a8 commit 7b55f27
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "saku"
version = "0.1.0"
edition = "2021"
readme = "README.md"
repository = "https://github.com/crispybaccoon/saku"
repository = "https://github.com/comfysage/saku"
license = "MIT OR Apache-2.0"

[[bin]]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Homebrew.
Run the installer using curl:

```shell
curl -fsSL https://github.com/crispybaccoon/saku/raw/mega/install.sh | sh
curl -fsSL https://github.com/comfysage/saku/raw/mega/install.sh | sh
```

Setup saku environment, add this to your `.bashrc`/`.zshrc`:
Expand Down Expand Up @@ -62,7 +62,7 @@ suggestions for improvements, or want to contribute new features, please submit
a pull request or open an issue on the GitHub repository.

Before contributing, please review the [contribution
guidelines](https://github.com/crispybaccoon/saku/blob/main/CONTRIBUTING.md)
guidelines](https://github.com/comfysage/saku/blob/main/CONTRIBUTING.md)
for instructions on how to contribute code, report bugs, and more.

## License
Expand All @@ -77,4 +77,4 @@ contributors and the open-source community for their valuable contributions.
## Contact

For any inquiries or questions, feel free to contact the project maintainer at
[[67917529+CrispyBaccoon@users.noreply.github.com]].
[[67917529+comfysage@users.noreply.github.com]].
2 changes: 1 addition & 1 deletion cliff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ footer = """
"""
# postprocessors
postprocessors = [
{ pattern = '<REPO>', replace = "https://github.com/crispybaccoon/saku" }, # replace repository URL
{ pattern = '<REPO>', replace = "https://github.com/comfysage/saku" }, # replace repository URL
]
[git]
# parse the commits based on https://www.conventionalcommits.org
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ printf " -\033[35m setting up\033[0m saku root\n"
mkdir -p $SAKUPATH/repo
cd $SAKUPATH/repo

printf " -\033[35m cloning\033[0m saku from\033[33m https://github.com/crispybaccoon/saku\033[0m\n"
git clone --filter=blob:none https://github.com/crispybaccoon/saku && cd saku
printf " -\033[35m cloning\033[0m saku from\033[33m https://github.com/comfysage/saku\033[0m\n"
git clone --filter=blob:none https://github.com/comfysage/saku && cd saku

printf " -\033[35m building\033[0m saku\n"
cargo build -r
Expand Down
4 changes: 2 additions & 2 deletions saku-cli/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ pub fn init() -> Result<()> {
io::mkdir(path::gr("custom"))?;

if !path::pkg_exists("flasks", "core") {
msg::fetch("core", "https://github.com/crispybaccoon/pkg");
msg::fetch("core", "https://github.com/comfysage/pkg");

flask::add_with_name("core", "crispybaccoon/pkg")?;
flask::add_with_name("core", "comfysage/pkg")?;
}

if !path::repo_exists("core") {
Expand Down
2 changes: 1 addition & 1 deletion saku-lib/pkg/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub struct Config {

impl Config {
pub fn path() -> Result<String> {
if let Some(path) = directories::ProjectDirs::from("dev", "crispybaccoon", "saku") {
if let Some(path) = directories::ProjectDirs::from("dev", "comfysage", "saku") {
let dir = path.config_dir();
let path = filepath::join(dir.to_str().ok_or(make_err!())?, &*constants::CONFIG_NAME);
return Ok(path);
Expand Down
14 changes: 7 additions & 7 deletions saku-lib/pkg/flask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::prelude::*;
use crate::pkg::pkg::Pkg;

// examples:
// Flask({ name: "crispybaccoon.core", url: "crispybaccoon/core" }, "crispybaccoon/core")
// Flask({ name: "comfysage.core", url: "comfysage/core" }, "comfysage/core")
// Flask({ name: "aur.archlinux.org.pkg", url: "aur.archlinux.org/pkg" }, "aur.archlinux.org/pkg")

#[derive(Debug)]
Expand Down Expand Up @@ -84,12 +84,12 @@ mod test {

#[test]
fn new() -> Result<()> {
let (name, url) = ("crispybaccoon.core", "crispybaccoon/core");
let (name, url) = ("comfysage.core", "comfysage/core");
let flask = Flask::new(name, url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);

let (name, url) = ("core", "crispybaccoon/core");
let (name, url) = ("core", "comfysage/core");
let flask = Flask::new(name, url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);
Expand All @@ -98,12 +98,12 @@ mod test {
}
#[test]
fn from_url() -> Result<()> {
let (name, url) = ("crispybaccoon.core", "crispybaccoon/core");
let (name, url) = ("comfysage.core", "comfysage/core");
let flask = Flask::from_url(url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);

let (name, url) = ("crispybaccoon.core", "crispybaccoon/core");
let (name, url) = ("comfysage.core", "comfysage/core");
let flask = Flask::from_url(url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);
Expand All @@ -112,7 +112,7 @@ mod test {
}
#[test]
fn from_pkg() -> Result<()> {
let (name, url) = ("crispybaccoon.core", "crispybaccoon/core");
let (name, url) = ("comfysage.core", "comfysage/core");
let flask = Flask::new(name, url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);
Expand All @@ -122,7 +122,7 @@ mod test {
assert_eq!(flask_pkg.pkg().name, name);
assert_eq!(flask_pkg.url(), url);

let (name, url) = ("core", "crispybaccoon/core");
let (name, url) = ("core", "comfysage/core");
let flask = Flask::new(name, url)?;
assert_eq!(flask.pkg().name, name);
assert_eq!(flask.url(), url);
Expand Down
26 changes: 13 additions & 13 deletions saku-lib/util/url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ mod test {
#[test]
fn extend_url() -> Result<()> {
assert_eq!(
super::extend_url("crispybaccoon/pkg")?,
"https://github.com/crispybaccoon/pkg"
super::extend_url("comfysage/pkg")?,
"https://github.com/comfysage/pkg"
);
assert_eq!(
super::extend_url("https://github.com/crispybaccoon/pkg")?,
"https://github.com/crispybaccoon/pkg"
super::extend_url("https://github.com/comfysage/pkg")?,
"https://github.com/comfysage/pkg"
);
assert_eq!(
super::extend_url("aur.archlinux.org/pkg")?,
Expand All @@ -113,27 +113,27 @@ mod test {
);

assert_eq!(
super::shorten_url("https://github.com/crispybaccoon/pkg.git")?,
"crispybaccoon/pkg"
super::shorten_url("https://github.com/comfysage/pkg.git")?,
"comfysage/pkg"
);
assert_eq!(
super::shorten_url("github.com/crispybaccoon/pkg.git")?,
"crispybaccoon/pkg"
super::shorten_url("github.com/comfysage/pkg.git")?,
"comfysage/pkg"
);
assert_eq!(
super::shorten_url("github.com/crispybaccoon/pkg")?,
"crispybaccoon/pkg"
super::shorten_url("github.com/comfysage/pkg")?,
"comfysage/pkg"
);
assert_eq!(
super::shorten_url("crispybaccoon/pkg")?,
"crispybaccoon/pkg"
super::shorten_url("comfysage/pkg")?,
"comfysage/pkg"
);
Ok(())
}

#[test]
fn url_name() -> Result<()> {
assert_eq!(super::url_name("crispybaccoon/core")?, "crispybaccoon.core");
assert_eq!(super::url_name("comfysage/core")?, "comfysage.core");
assert_eq!(
super::url_name("aur.archlinux.org/pkg")?,
"aur.archlinux.org.pkg"
Expand Down

0 comments on commit 7b55f27

Please sign in to comment.