Fix maybe_source_env_file and implement better screenshotting
This commit is contained in:
parent
71b9ace58a
commit
151a649d94
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
|
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
[ -z "$DOTFILES_PATH" ] && export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
|
[ -z "$DOTFILES_PATH" ] && export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
|
||||||
|
@ -17,4 +17,4 @@ export SSH_AUTH_SOCK
|
||||||
|
|
||||||
xset r rate 250 80 & # keyrepeat
|
xset r rate 250 80 & # keyrepeat
|
||||||
|
|
||||||
. maybe_source_env_file x/profile
|
source maybe_source_env_file x/profile
|
||||||
|
|
13
bin/clipshot
13
bin/clipshot
|
@ -5,11 +5,12 @@ if is_wayland; then
|
||||||
else
|
else
|
||||||
pkill unclutter
|
pkill unclutter
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
import ~/.ss.png
|
fn="$SCROTS_PATH/clipshot_$(date +"%Y-%m-%d_%H-%M-%S").png"
|
||||||
chmod 700 ~/.ss.png
|
import "$fn"
|
||||||
< ~/.ss.png xclip -t image/png -i -selection clipboard
|
chmod 700 "$fn"
|
||||||
< ~/.ss.png xclip -t image/png -i -selection primary
|
< "$fn" xclip -t image/png -i -selection clipboard
|
||||||
< ~/.ss.png xclip -t image/png -i -selection secondary
|
< "$fn" xclip -t image/png -i -selection primary
|
||||||
< ~/.ss.png xclip -t image/png -i -selection buffer-cut
|
< "$fn" xclip -t image/png -i -selection secondary
|
||||||
|
< "$fn" xclip -t image/png -i -selection buffer-cut
|
||||||
unclutter &
|
unclutter &
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
f="$1"; shift; . source_if_exists "$ENV_PATH/$f" "$@"
|
set -xe
|
||||||
|
|
||||||
|
f="$1"; shift
|
||||||
|
[ -f "$f" ] && source "$f" "$@"
|
||||||
|
true
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
SCROT_DIR="$NICE_HOME/img/scrots"
|
SCROT_DIR="$NICE_HOME/img/scrots"
|
||||||
mkdir -p "$SCROT_DIR/"
|
mkdir -p "$SCROT_DIR/"
|
||||||
FILENAME="$SCROT_DIR/%Y-%m-%d_%H-%M-%S_\$wx\$h.png"
|
FILENAME="$SCROT_DIR/screenshot_%Y-%m-%d_%H-%M-%S_\$wx\$h.png"
|
||||||
scrot "$@" "${FILENAME}" >/dev/null && echo "Saved screenshot to: ${FILENAME}"
|
scrot "$@" "${FILENAME}" >/dev/null && echo "Saved screenshot to: ${FILENAME}"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
[ "$#" -lt 1 ] && { echo "No arguments provided" >&2 ; exit 1; }
|
[ "$#" -lt 1 ] && { echo "No arguments provided" >&2 ; exit 1; }
|
||||||
[ "$#" -gt 1 ] && { echo "Too many arguments provided" >&2 ; exit 2; }
|
|
||||||
|
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
{ [ -f "$1" ] && . "$1"; } || { echo "$1 does not exist" >&2 ; exit 3; }
|
f="$1"; shift
|
||||||
|
{ [ -f "$f" ] && source "$f" "$@"; } || { echo "$f does not exist" >&2 ; exit 3; }
|
||||||
|
|
Reference in a new issue