misc fixes

Start9Labs · Nov 15, 2024 · cfa1940 · cfa1940
1 parent 645b856
commit cfa1940
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/lib/scripts/prune-images b/build/lib/scripts/prune-images
@@ -33,10 +33,11 @@ if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/cur
     echo 'Pruning...'
     current="$(readlink -f /media/startos/config/current.rootfs)"
     while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
-        to_prune="$(ls -t1 /media/startos/images/*.rootfs /media/startos/images/*.squashfs | grep -v "$current" | tail -n1)"
+        to_prune="$(ls -t1 /media/startos/images/*.rootfs /media/startos/images/*.squashfs 2> /dev/null | grep -v "$current" | tail -n1)"
         if [ -e "$to_prune" ]; then
             echo "  Pruning $to_prune"
             rm -rf "$to_prune"
+            sync
         else
             >&2 echo "Not enough space and nothing to prune!"
             exit 1

diff --git a/core/startos/src/net/acme.rs b/core/startos/src/net/acme.rs
@@ -163,8 +163,8 @@ pub fn acme<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "init",
             from_fn_async(init)
-                .with_about("Setup ACME certificate acquisition")
                 .no_display()
+                .with_about("Setup ACME certificate acquisition")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -184,6 +184,7 @@ impl FromStr for AcmeProvider {
             "letsencrypt-staging" => async_acme::acme::LETS_ENCRYPT_STAGING_DIRECTORY.parse(),
             s => s.parse(),
         }
+        .map(Self)
     }
 }
 impl ValueParserFactory for AcmeProvider {