Merge branch 'master' of github.com:carlosbm/bashblog
This commit is contained in:
commit
4f2e022471
1 changed files with 9 additions and 5 deletions
8
bb.sh
8
bb.sh
|
@ -85,6 +85,10 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
# It is recommended to perform a 'rebuild' after changing any of this in the code
|
# It is recommended to perform a 'rebuild' after changing any of this in the code
|
||||||
|
|
||||||
|
# Config file. Use instead of this function if you want to avoid merges in VCS
|
||||||
|
global_config=".config"
|
||||||
|
|
||||||
global_variables() {
|
global_variables() {
|
||||||
global_software_name="BashBlog"
|
global_software_name="BashBlog"
|
||||||
global_software_version="1.5.1"
|
global_software_version="1.5.1"
|
||||||
|
@ -623,7 +627,8 @@ reset() {
|
||||||
# $1 command to run
|
# $1 command to run
|
||||||
# $2 file name of a draft to continue editing (optional)
|
# $2 file name of a draft to continue editing (optional)
|
||||||
do_main() {
|
do_main() {
|
||||||
global_variables
|
# Use config file or fallback to inline configuration
|
||||||
|
source "$global_config" || global_variables
|
||||||
|
|
||||||
# Check for $EDITOR
|
# Check for $EDITOR
|
||||||
if [[ -z "$EDITOR" ]]; then
|
if [[ -z "$EDITOR" ]]; then
|
||||||
|
@ -684,4 +689,3 @@ do_main() {
|
||||||
# Do not change anything here. If you want to modify the code, edit do_main()
|
# Do not change anything here. If you want to modify the code, edit do_main()
|
||||||
#
|
#
|
||||||
do_main $*
|
do_main $*
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue