Merge tag 'v1.4.6' into develop

Add warning when bc is missing

.gitignore

@@ -1,3 +1,4 @@
+.aur/
 *.md
 nextshot
 testfiles/

CHANGELOG.md

@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * NextCloud uploads can now be aborted or renamed if they would overwrite another file
 
 
+## [1.4.6] - 2023-07-30
+### Added
+* `bc` is now included in the dependency check
+
+### Fixed
+* Fixed fallback to default hlColour when bc is missing
+
+
 ## [1.4.5] - 2023-05-07
 ### Fixed
 * Updated Makefile to fix broken install in 1.4.4
@@ -253,7 +261,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Copying link to clipboard on X11 and Wayland
 
 
-[Unreleased]: https://github.com/dshoreman/nextshot/compare/v1.4.5...develop
+[Unreleased]: https://github.com/dshoreman/nextshot/compare/v1.4.6...develop
+[1.4.6]: https://github.com/dshoreman/nextshot/compare/v1.4.5...v1.4.6
 [1.4.5]: https://github.com/dshoreman/nextshot/compare/v1.4.4...v1.4.5
 [1.4.4]: https://github.com/dshoreman/nextshot/compare/v1.4.3...v1.4.4
 [1.4.3]: https://github.com/dshoreman/nextshot/compare/v1.4.2...v1.4.3

src/_colours.bash

@@ -16,7 +16,11 @@ parse_colour() {
 
     if is_wayland; then
         echo "#$(int2hex "$red")$(int2hex "$green")$(int2hex "$blue")"
-    else
+    elif has bc; then
         echo "$(int2dec "$red"),$(int2dec "$green"),$(int2dec "$blue")"
+    else
+        prefers bc
+        echo -e "\nColour conversion unavailable, falling back to default.\n" >&2
+        echo "1,0.39,0.71"
     fi
 }

src/_dependencies.bash

@@ -30,9 +30,10 @@ status_check() {
         "wl-copy        wl-clipboard to interact with the clipboard"
     )
     local reqX=(
-        "slop   slop        for window and area selection"
         "import imagemagick to take screenshots"
+        "slop   slop        for window and area selection"
         "xclip  xclip       to interact with the clipboard"
+        "bc     bc          for colour conversions in config"
     )
 
     echo

src/main.bash

@@ -33,7 +33,7 @@ readonly _CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/nextshot"
 readonly _RUNTIME_DIR="${XDG_RUNTIME_DIR:-"/tmp"}/nextshot"
 readonly _CONFIG_FILE="$_CONFIG_DIR/nextshot.conf"
 readonly _TRAY_FIFO="$_RUNTIME_DIR/traymenu"
-readonly _VERSION="1.4.5"
+readonly _VERSION="1.4.6"
 
 source "${SCRIPT_ROOT}/_cache.bash"
 source "${SCRIPT_ROOT}/_capture.bash"