diff --git a/assets/var/gnu/cups/s6.md b/assets/var/gnu/cups/s6.md index d81494b..64e2b3a 100644 --- a/assets/var/gnu/cups/s6.md +++ b/assets/var/gnu/cups/s6.md @@ -5,6 +5,7 @@ ``` sh *** set *** pkgname_flat=${pkgname//\//\~} pkgname_flat=${pkgname_flat%\~s6} +rm -f /pkg/gnu/s6/etc/service/current/$pkgname_flat ln -sf $(pwd) /pkg/gnu/s6/etc/service/current/$pkgname_flat s6-svscanctl -h /pkg/gnu/s6/etc/service/current ``` diff --git a/assets/var/gnu/llama.cpp/s6.md b/assets/var/gnu/llama.cpp/s6.md index d81494b..64e2b3a 100644 --- a/assets/var/gnu/llama.cpp/s6.md +++ b/assets/var/gnu/llama.cpp/s6.md @@ -5,6 +5,7 @@ ``` sh *** set *** pkgname_flat=${pkgname//\//\~} pkgname_flat=${pkgname_flat%\~s6} +rm -f /pkg/gnu/s6/etc/service/current/$pkgname_flat ln -sf $(pwd) /pkg/gnu/s6/etc/service/current/$pkgname_flat s6-svscanctl -h /pkg/gnu/s6/etc/service/current ``` diff --git a/assets/var/gnu/ollama/s6.md b/assets/var/gnu/ollama/s6.md index d81494b..64e2b3a 100644 --- a/assets/var/gnu/ollama/s6.md +++ b/assets/var/gnu/ollama/s6.md @@ -5,6 +5,7 @@ ``` sh *** set *** pkgname_flat=${pkgname//\//\~} pkgname_flat=${pkgname_flat%\~s6} +rm -f /pkg/gnu/s6/etc/service/current/$pkgname_flat ln -sf $(pwd) /pkg/gnu/s6/etc/service/current/$pkgname_flat s6-svscanctl -h /pkg/gnu/s6/etc/service/current ``` diff --git a/assets/var/gnu/unitprint/backend-local/s6.md b/assets/var/gnu/unitprint/backend-local/s6.md index d81494b..64e2b3a 100644 --- a/assets/var/gnu/unitprint/backend-local/s6.md +++ b/assets/var/gnu/unitprint/backend-local/s6.md @@ -5,6 +5,7 @@ ``` sh *** set *** pkgname_flat=${pkgname//\//\~} pkgname_flat=${pkgname_flat%\~s6} +rm -f /pkg/gnu/s6/etc/service/current/$pkgname_flat ln -sf $(pwd) /pkg/gnu/s6/etc/service/current/$pkgname_flat s6-svscanctl -h /pkg/gnu/s6/etc/service/current ``` diff --git a/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run b/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run deleted file mode 120000 index 335ed1d..0000000 --- a/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run +++ /dev/null @@ -1 +0,0 @@ -../bin/backend-local \ No newline at end of file diff --git a/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run b/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run new file mode 100755 index 0000000..163bc5d --- /dev/null +++ b/assets/var/gnu/unitprint/backend-local/s6/.pkgdata/run @@ -0,0 +1,2 @@ +#!/pkg/gnu/bin/zsh +/pkg/gnu/unitprint/backend-local/bin/backend-local diff --git a/assets/var/gnu/unitprint/web-app.md b/assets/var/gnu/unitprint/web-app.md index cbd7d8a..fe2b1c8 100644 --- a/assets/var/gnu/unitprint/web-app.md +++ b/assets/var/gnu/unitprint/web-app.md @@ -2,6 +2,10 @@ unitprint/web-app = ssh://git@root-kit.ru:17458/UnitPrint/web-app.git +``` env *** env *** +save_source +``` + ``` sh *** build *** git pull npm install @@ -11,6 +15,7 @@ cp -rPl dist .. ``` ``` sh *** config *** +rm -f build-script.md chmod o+x /pkg/gnu/unitprint chown -R nginx:nginx /pkg/gnu/unitprint/web-app/dist ``` diff --git a/src/commands/run/build.rs b/src/commands/run/build.rs index 46ad346..a22f37d 100644 --- a/src/commands/run/build.rs +++ b/src/commands/run/build.rs @@ -46,7 +46,7 @@ pub fn build(repo: &String, pkgname: &String) { fs::write(&applied_build, &build_script).unwrap(); update_built_link(&md_path, &built_md_path); - if full_env.get("save_source").is_none() { + if !full_env.get("save_source").is_some() { fs::remove_dir_all(&src_dir).ok(); }