yuriy/joplin-snippy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update snippy to handle empty snippets

Browse Source
This commit is contained in:
BarbUk 2019-02-14 17:01:04 +04:00
parent 02976d1829
commit ee60bd3432
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
snippy
View File

@ -113,12 +113,21 @@ run() {
[[ -z "${snippet}" ]] && return 1 [[ -z "${snippet}" ]] && return 1
if [ -f "${snippets_directory}/${snippet}" ]; then if [ -f "${snippets_directory}/${snippet}" ]; then
# Put the contents of the selected file into the paste buffer. # Put the contents of the selected file into the paste buffer.
# If file is empty, the content is the basename of the file
if [ ! -s "${snippets_directory}/${snippet}" ]; then
content="$(basename "${snippet}")"
# don't parse file with the ##noparse header # don't parse file with the ##noparse header
if grep -qE "^##noparse" "${snippets_directory}/${snippet}"; then elif grep -qE "^##noparse" "${snippets_directory}/${snippet}"; then
content="$( tail -n +2 "${snippets_directory}/${snippet}" )" content="$( tail -n +2 "${snippets_directory}/${snippet}" )"
# execute bash script in scripts dir
elif [[ $(dirname "${snippet}") == 'scripts' ]] && grep -qE "^#!/bin/bash" "${snippets_directory}/${snippet}"; then elif [[ $(dirname "${snippet}") == 'scripts' ]] && grep -qE "^#!/bin/bash" "${snippets_directory}/${snippet}"; then
content="$( bash "${snippets_directory}/${snippet}" )" content="$( bash "${snippets_directory}/${snippet}" )"
# default action
else else
content="$( bashdown < "${snippets_directory}/${snippet}" )" content="$( bashdown < "${snippets_directory}/${snippet}" )"
fi fi