Merge branch 'mistress' of github.com:queer/boxxy into mistress

Cargo.toml

@@ -13,7 +13,7 @@ bat = { version = "0.23.0", default-features = false, features = [
 ] }
 byteorder = "1.5.0"
 cfg-if = "1.0.0"
-clap = { version = "4.5.8", features = ["derive"] }
+clap = { version = "4.5.11", features = ["derive"] }
 color-eyre = { version = "0.6.3", features = ["issue-url"] }
 config = "0.14.0"
 ctrlc = "3.4.4"

README.md

@@ -47,15 +47,15 @@ force it to puts its data somewhere nice and proper.
 - opt-in immutable fs outside of rule rewrites, ie only the files/directories
   you specify in rules are writable
 - `0.5.0`: boxxy can scan your homedir to automatically suggest rules for
-  you! ![image of boxxy scan](https://cdn.mewna.xyz/2023/03/25/G6hrd3iQjEy65.png)
+  you! ![image of boxxy scan](https://amyware.nyc3.digitaloceanspaces.com/2023/03/25/G6hrd3iQjEy65.png)
 - `0.6.0`: boxxy can use project-local `boxxy.yaml` files, and can load
-  `.env` files for you! ![image of 0.6.0 features](https://cdn.mewna.xyz/2023/03/28/Jawp5It1xrnWN.png)
-- `0.6.1`: boxxy rules can inject env vars: ![image of 0.6.1 features](https://cdn.mewna.xyz/2023/03/29/ukcWuiYdtI8yq.png)
+  `.env` files for you! ![image of 0.6.0 features](https://amyware.nyc3.digitaloceanspaces.com/2023/03/28/Jawp5It1xrnWN.png)
+- `0.6.1`: boxxy rules can inject env vars: ![image of 0.6.1 features](https://amyware.nyc3.digitaloceanspaces.com/2023/03/29/ukcWuiYdtI8yq.png)
 - `0.7.2`: boxxy can fork the boxxed process into the background with the
   `--daemon` flag.
 - `0.8.0`: boxxy can pass rules at the command line with `--rule`, and disable
   loading config files with `--no-config`.
-- `0.8.2`: Explain how to run AppImages properly: ![image of 0.8.2 features](https://cdn.mewna.xyz/2023/10/31/yMiHJaURUud6E.png)
+- `0.8.2`: Explain how to run AppImages properly: ![image of 0.8.2 features](https://amyware.nyc3.digitaloceanspaces.com/2023/10/31/yMiHJaURUud6E.png)
 
 ### potential drawbacks
 
@@ -99,6 +99,26 @@ git:(mistress) | ▶
 - stop using symlinks!!!
 - no more dev config files when writing code
 
+## requirements
+
+boxxy requires `newuidmap` to function, which is not included by default in all
+distributions. To install:
+
+Alpine:
+```sh
+$ apk add shadow-uidmap
+```
+
+Debian / Ubuntu:
+```sh
+$ apt install uidmap
+```
+
+RHEL / Fedora:
+```sh
+$ yum install shadow-utils
+```
+
 ## configuration
 
 The boxxy configuration file lives in `~/.config/boxxy/boxxy.yaml`. If none

src/enclosure/mod.rs

@@ -378,7 +378,7 @@ impl Enclosure {
             debug!("removing temporary file {}", file.display());
             std::fs::remove_file(file)?;
         }
-        for dir in &self.created_directories {
+        for dir in (&self.created_directories).iter().rev() {
             debug!("removing temporary directory {}", dir.display());
             std::fs::remove_dir(dir)?;
         }