0ct0pu5/bashblog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:carlosbm/bashblog

Browse source
This commit is contained in:
Carlos Bautista 2013-04-02 14:37:08 +02:00
commit 4f2e022471
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bb.sh
View file

@ -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"
@ -428,7 +432,7 @@ rebuild_index() {
# Displays a list of the posts # Displays a list of the posts
list_posts() { list_posts() {
ls *.html &> /dev/null ls *.html &> /dev/null
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "No posts yet. Use 'bb.sh post' to create one" echo "No posts yet. Use 'bb.sh post' to create one"
return return
fi fi
@ -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
@ -658,8 +663,8 @@ do_main() {
# We're going to back up just in case # We're going to back up just in case
ls *.html &> /dev/null ls *.html &> /dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
tar cfz ".backup.tar.gz" *.html tar cfz ".backup.tar.gz" *.html
chmod 600 ".backup.tar.gz" chmod 600 ".backup.tar.gz"
fi fi
if [ "$1" == "reset" ]; then if [ "$1" == "reset" ]; 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 $*