Mise à jour : réécriture de glurp

bin/glurp

@@ -1,52 +1,84 @@
-#!/bin/sh
+#!/bin/bash
 
-error_usage() {
+declare -A temp_files
-    >&2 cat << EOF
+temp_files[command_to_source]=$(mktemp)
-Usage :
+
+clean() {
+    rm -- "${temp_files[@]}"
+}
+
+usage() {
+    cat << EOF
+Usage:
     glurp full|area clip|file
 EOF
-    exit 1
+}
+
+error() {
+    >&2 printf '\033[0m\033[1;31mERROR:\033[0m \033[1m%s\033[0m\n' "$*"
+}
+
+error_usage() {
+    error "Invalid usage"
+    >&2 usage
+}
+
+error_usage_clean() {
+    error_usage
+    clean
 }
 
 screenshot_path() {
-    printf %s "/tmp/screenshot-${USER}-$(date +%N).png"
+    local path
+    if [ -n "$1" ]; then
+        path="$1"
+    else
+        path=.
+    fi
+    mkdir -p "$path"
+    printf '%sscreenshot-%s.png' "${path}/" "$(date +%Y_%m_%d_%H_%M_%S_%N)"
 }
 
-grim=grim
+trap error_usage_clean EXIT
-wl_copy_args="-t image/png"
+set -e
+
+slurp=()
+grim_args=()
+wl_copy=()
 
-# Arguments
 case "$1" in
     full)
+        :
         ;;
     area)
-        slurp=slurp
+        slurp+=(slurp \|)
-        pipe1='|'
+        grim_args+=(-g -)
-        grim_args="-g -"
         ;;
     *)
-        error_usage
+        false
         ;;
 esac
 shift
 
 case "$1" in
     clip)
-        pipe2='|'
+        wl_copy+=(\| wl-copy -t image/png)
-        wl_copy=wl-copy
+        grim_args+=(-)
         ;;
     file)
-        grim_args="${grim_args} $(screenshot_path)"
+        grim_args+=("$(screenshot_path "/tmp/${USER}")")
         ;;
     *)
-        error_usage
+        false
         ;;
 esac
 shift
 
-[ -n "$wl_copy" ] && wl_copy="${wl_copy} ${wl_copy_args}"
+cat > "${temp_files[command_to_source]}" << EOF
+${slurp[@]} grim ${grim_args[@]} ${@} ${wl_copy[@]}
+EOF
 
-# Execution
+trap clean EXIT
-set -xe
+
-"$slurp" "$pipe1" "$grim" "$grim_args" "$pipe2" "$wl_copy"
+sh -s < "${temp_files[command_to_source]}"
 

bin/sshot-file

@@ -1,3 +0,0 @@
-#!/bin/sh
-exec printf "$@" "screenshot-%s.${1:-png}" "$(date +"%Y_%m_%d-%N")"
-