i.ortega
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUGFIXES

This commit is contained in:
inigoortega 2019-12-07 12:22:55 +01:00
parent c720d8b825
commit 646d11ff32
3 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/insert-pass.sh
View File

@ -22,42 +22,33 @@ username="$(rofi -dmenu -i -p "Username")"
[ -d "$page" ] && [ -e "$page$username.gpg" ] && notify-send "Account already \ [ -d "$page" ] && [ -e "$page$username.gpg" ] && notify-send "Account already \
exists" && exit 1 exists" && exit 1
# mkdir $HOME/.username-store 2> /dev/null
# dir=""
# while [ -n "$( printf "%b\n" "$page" | grep "/" )" ]; do
# dir="$dir$(printf "%b\n" "$page" | sed "s|/.*$||")/"
# mkdir $HOME/.username-store/$dir 2> /dev/null
# page="$(printf "%b\n" "$page" | sed "s|^[^/]*/||")"
# done
# printf "%b\n" "$username" > $HOME/.username-store/$dir$page
comments="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Comments?")" comments="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Comments?")"
[ -z $(printf "%b\n" "$comments" | grep -E "(Yes|No)") ] && exit 0 [ -z "$(printf "%b\n" "$comments" | grep -E "(Yes|No)")" ] && exit 0
generate="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Generate password?")" generate="$(printf "%b\n" "Yes\nNo" | rofi -dmenu -i -p "Generate password?")"
[ -z $(printf "%b\n" "$generate" | grep -E "(Yes|No)") ] && exit 0 [ -z "$(printf "%b\n" "$generate" | grep -E "(Yes|No)")" ] && exit 0
contents="login: $username" contents="login: $username"
if [ "$generate" = "Yes" ]; then if [ "$generate" = "Yes" ]; then
contents="$(pwgen -ysBv 15 -N 1)\n$contents" contents="$(pwgen -ysBv 15 -N 1)\n$contents"
if [ "$comments" = "Yes" ]; then if [ "$comments" = "Yes" ]; then
file="/tmp/comments$(date +%s)" file="/tmp/comments$(date +%s)"
$TSCRIPTS/run-on-terminal.sh $EDITOR $file dash $TSCRIPTS/run-on-terminal.sh $EDITOR $file
# [ -z "${TERMINAL##*termite*}" ] && $TERMINAL -e "$EDITOR \"$file\"" \ [ ! -f "$file" -o -z "$(cat "$file")" ] && notify-send "Operation CANCELLED" && exit 1
# || $TERMINAL -e $EDITOR "$file"
[ -z "$(cat $file)" ] && notify-send "Operation CANCELLED" && exit 1
contents="$contents\ncomments: $(cat "$file")" contents="$contents\ncomments: $(cat "$file")"
rm "$file" rm "$file"
fi fi
[ -f "$page.gpg" ] && mkdir "$page" && \ if [ -f "$page.gpg" ]; then
olduser="$(dash $SCRIPTS/get-pass-username.sh --print \ mkdir "$page"
"$page_relative")" && mv "$page.gpg" "$page/$olduser.gpg" olduser="$(dash $SCRIPTS/get-pass-username.sh --print "$page_relative")"
mv "$page.gpg" "$page/$olduser.gpg"
fi
[ -d "$page" ] && page_relative="$page_relative/$username" [ -d "$page" ] && page_relative="$page_relative/$username"
printf "%b\n" "$contents" | pass insert -m "$page_relative" || \ printf "%b\n" "$contents" | pass insert -m "$page_relative" || \
(notify-send "Already exists" && exit 1) (notify-send "Already exists" && exit 1)
else else
@ -74,20 +65,20 @@ else
contents="$passwd\n$contents" contents="$passwd\n$contents"
if [ "$comments" = "Yes" ]; then if [ "$comments" = "Yes" ]; then
file="/tmp/comments$(date +%s)" file="/tmp/comments$(date +%s)"
$TSCRIPTS/run-on-terminal.sh $EDITOR $file dash $TSCRIPTS/run-on-terminal.sh $EDITOR $file
# [ -z "${TERMINAL##*termite*}" ] && $TERMINAL -e "$EDITOR \"$file\"" \ [ ! -f "$file" -o -z "$(cat "$file")" ] && notify-send "Operation CANCELLED" && exit 1
# || $TERMINAL -e $EDITOR "$file"
contents="$contents\ncomments: $(cat "$file")" contents="$contents\ncomments: $(cat "$file")"
[ -z "$(cat $file)" ] && notify-send "Operation CANCELLED" && exit 1
rm "$file" rm "$file"
fi fi
[ -f "$page.gpg" ] && mkdir "$page" && \
olduser="$(dash $SCRIPTS/get-pass-username.sh --print \ if [ -f "$page.gpg" ]; then
"$page_relative")" && mv "$page.gpg" "$page/$olduser.gpg" mkdir "$page"
olduser="$(dash $SCRIPTS/get-pass-username.sh --print "$page_relative")"
mv "$page.gpg" "$page/$olduser.gpg"
fi
[ -d "$page" ] && page_relative="$page_relative/$username" [ -d "$page" ] && page_relative="$page_relative/$username"
printf "%b\n" "$contents" | pass insert -m "$page_relative" || \ printf "%b\n" "$contents" | pass insert -m "$page_relative" || \
(notify-send "Already exists" && exit 1) (notify-send "Already exists" && exit 1)
# dir="$(printf "%b\n" "$page" | sed "s|[^/]*$||")"
# page="$(printf "%b\n" "$page" | sed "s|^.*/||")"
# printf "%b\n" "$username" > "$PASSWORD_STORE_DIR/$dir.$page.user"
fi fi

12
scripts/yt-search.sh
View File

@ -2,10 +2,14 @@
search="$(rofi -dmenu)" search="$(rofi -dmenu)"
id="$(youtube-dl --get-id "ytsearch:$search")" if [ -n "$search" ]; then
link="https://invidio.us/watch?v=$id" id="$(youtube-dl --get-id "ytsearch:$search")"
mpv "$link" 1>&2 link="https://invidio.us/watch?v=$id"
printf "%b\n" "$link" mpv "$link" 1>&2
printf "%b\n" "$link"
fi

2
termscripts/play-videos-from-file.sh
View File

@ -13,7 +13,7 @@ do
mpv "$video" mpv "$video"
length="$(wc -l "$1")" length="$(wc -l "$1" | awk '{print $1}')"
if [ "$length" -eq "$current_video" ]; then if [ "$length" -eq "$current_video" ]; then
sleep 5m sleep 5m
fi fi