waycrate · murlakatamenka · Mar 12, 2024 · Mar 12, 2024 · Mar 14, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Build
       run: |
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Check formatting
       run: |
@@ -37,7 +37,11 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Check docs
+      env:
+        DEBIAN_FRONTEND: noninteractive
       run: |
         sudo apt update
         sudo apt install --no-install-recommends scdoc
-        for file in $(find . -type f -iwholename "./docs/*.scd"); do scdoc < $file > /dev/null; done
+        for file in ./docs/*.scd; do
+          scdoc < "$file" > /dev/null;
+        done
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 target
 *.gz
-*.out
 .direnv
 *.jpg
 *.jpeg

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -13,16 +13,24 @@ build:
 run:
 	@cargo run
 
-install: build
-	@mkdir -p $(TARGET_DIR)
-	@cp $(SOURCE_DIR)/$(BINARY) $(TARGET_DIR)
+docs:
+	@echo -n 'Generating docs with scdoc and gzip ... '
+	@for file in ./docs/*.scd ; do \
+		scdoc < "$$file" | gzip --best > "$${file%.scd}.gz" ; \
+	done
+	@echo 'done!'
+
+install: build docs
+	@mkdir -pv $(TARGET_DIR)
+	@cp -v $(SOURCE_DIR)/$(BINARY) $(TARGET_DIR)
 	@chmod +x $(TARGET_DIR)/$(BINARY)
-	@find ./docs -type f -iname "*.1.gz" -exec cp {} $(MAN1_DIR) \;
-	@find ./docs -type f -iname "*.7.gz" -exec cp {} $(MAN7_DIR) \;
+	@cp -v ./docs/wayshot.1.gz $(MAN1_DIR)
+	@cp -v ./docs/wayshot.7.gz $(MAN7_DIR)
+
 
 uninstall:
-	@rm -f $(TARGET_DIR)/$(BINARY)
-	@rm -f /usr/share/man/**/wayshot.*
+	@rm -fv $(TARGET_DIR)/$(BINARY)
+	@rm -fv /usr/share/man/**/wayshot.*
 
 check:
 	@cargo fmt
@@ -31,10 +39,10 @@ check:
 
 clean:
 	@cargo clean
-	@rm -f ./docs/*.1.gz
+	@rm -fv ./docs/*.gz
 
 setup:
 	@rustup install stable
 	@rustup default stable
 
-.PHONY: check clean setup all install build
+.PHONY: check clean setup all install build docs
diff --git a/wayshot/Cargo.toml b/wayshot/Cargo.toml
@@ -10,11 +10,6 @@ keywords.workspace = true
 license.workspace = true
 repository.workspace = true
 
-[build-dependencies]
-flate2 = "1.0.27"
-eyre = "0.6.8"
-
-
 [dependencies]
 tracing.workspace = true
 

diff --git a/wayshot/build.rs b/wayshot/build.rs
diff --git a/wayshot/docs b/wayshot/docs
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     target
     *.gz
-    *.out
     .direnv
     *.jpg
     *.jpeg
@@ Expand Down @@