Skip to content

Commit 65b2d38

Browse files
committed
Merge branch 'master' into delphinus-feature/cache-first
refs gh-57 * master: Update version to 5.7.8 Improve variable name in _add().
2 parents 5d07ac1 + fae3648 commit 65b2d38

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

nb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ IFS=$'\n\t'
6868
# $_VERSION
6969
#
7070
# The most recent program version.
71-
_VERSION="5.7.7"
71+
_VERSION="5.7.8"
7272

7373
# $_ME
7474
#
@@ -2920,7 +2920,7 @@ _add() {
29202920
local _edit_before_commit=0
29212921
local _encrypt=0
29222922
local _file_type="${NB_DEFAULT_EXTENSION}"
2923-
local _maybe_content_or_filename=
2923+
local _content_or_filename=
29242924
local _password=
29252925
local _target_filename=
29262926
local _title=
@@ -2966,9 +2966,9 @@ _add() {
29662966
shift
29672967
;;
29682968
*)
2969-
if [[ -z "${_maybe_content_or_filename:-}" ]]
2969+
if [[ -z "${_content_or_filename:-}" ]]
29702970
then
2971-
_maybe_content_or_filename="${__arg:-}"
2971+
_content_or_filename="${__arg:-}"
29722972
else
29732973
_arguments+=("${__arg:-}")
29742974
fi
@@ -2985,21 +2985,21 @@ _add() {
29852985
store tech top tk tv uk us vip wang website work xyz
29862986
)
29872987

2988-
local _maybe_content_or_filename_extension="${_maybe_content_or_filename##*\.}"
2988+
local _content_or_filename_extension="${_content_or_filename##*\.}"
29892989

2990-
if [[ -n "${_maybe_content_or_filename:-}" ]]
2990+
if [[ -n "${_content_or_filename:-}" ]]
29912991
then
2992-
if [[ "${_maybe_content_or_filename:-}" =~ \.[A-Za-z0-9]+$ ]] &&
2993-
[[ -n "${_maybe_content_or_filename_extension:-}" ]] &&
2992+
if [[ "${_content_or_filename:-}" =~ \.[A-Za-z0-9]+$ ]] &&
2993+
[[ -n "${_content_or_filename_extension:-}" ]] &&
29942994
[[ -z "${_target_filename}" ]] &&
2995-
! _string_is_url "${_maybe_content_or_filename:-}" &&
2996-
! _string_is_email "${_maybe_content_or_filename:-}" &&
2997-
! _contains "${_maybe_content_or_filename_extension:-}" \
2995+
! _string_is_url "${_content_or_filename:-}" &&
2996+
! _string_is_email "${_content_or_filename:-}" &&
2997+
! _contains "${_content_or_filename_extension:-}" \
29982998
"${_common_non_text_file_extension_tlds[@]}"
29992999
then
3000-
_target_filename="${_maybe_content_or_filename}"
3000+
_target_filename="${_content_or_filename}"
30013001
else
3002-
_content="${_maybe_content_or_filename}"
3002+
_content="${_content_or_filename}"
30033003
fi
30043004
fi
30053005

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nb.sh",
3-
"version": "5.7.7",
3+
"version": "5.7.8",
44
"description": "CLI note-taking, bookmarking, and archiving with encryption, search, Git-backed versioning and syncing, tagging, and more in a single portable script.",
55
"global": true,
66
"install": "make install",

0 commit comments

Comments
 (0)