Merge remote-tracking branch 'origin/pr/6/head' into develop

This commit is contained in:
Ingolf Wagner 2018-12-31 02:41:48 +01:00
commit 27f0523804

14
memo
View file

@ -18,7 +18,7 @@ pandoc_cmd=pandoc
MEMO_FOLDER="${MEMO_DIR:-$HOME/memo}" MEMO_FOLDER="${MEMO_DIR:-$HOME/memo}"
function precondition::provide_memo_folder(){ function precondition:provide_memo_folder(){
if [[ ! -d ${MEMO_FOLDER} ]] if [[ ! -d ${MEMO_FOLDER} ]]
then then
echo "create memo folder : ${MEMO_FOLDER}" echo "create memo folder : ${MEMO_FOLDER}"
@ -26,7 +26,7 @@ function precondition::provide_memo_folder(){
fi fi
} }
function precondition::provide_topic(){ function precondition:provide_topic(){
topic_name=$1 topic_name=$1
topic_path=${MEMO_FOLDER}/${topic_name} topic_path=${MEMO_FOLDER}/${topic_name}
topic_file=${topic_path}/memo.md topic_file=${topic_path}/memo.md
@ -88,7 +88,7 @@ function git:run_command(){
function remove_topic (){ function remove_topic (){
topic_name=$1 topic_name=$1
#precondition::provide_topic ${topic_name} #precondition:provide_topic ${topic_name}
topic_path=${MEMO_FOLDER}/${topic_name} topic_path=${MEMO_FOLDER}/${topic_name}
if [[ -d ${topic_path} ]] if [[ -d ${topic_path} ]]
@ -106,7 +106,7 @@ function remove_topic (){
function edit_topic () { function edit_topic () {
topic_name=$1 topic_name=$1
precondition::provide_topic ${topic_name} precondition:provide_topic ${topic_name}
topic_path=${MEMO_FOLDER}/${topic_name} topic_path=${MEMO_FOLDER}/${topic_name}
if [[ -z ${EDITOR} ]] if [[ -z ${EDITOR} ]]
@ -127,7 +127,7 @@ function edit_topic () {
function add_memo(){ function add_memo(){
topic_name=$1 topic_name=$1
precondition::provide_topic ${topic_name} precondition:provide_topic ${topic_name}
topic_path=${MEMO_FOLDER}/${topic_name} topic_path=${MEMO_FOLDER}/${topic_name}
topic_file=${topic_path}/memo.md topic_file=${topic_path}/memo.md
@ -178,7 +178,7 @@ function copy_file(){
exit 1 exit 1
fi fi
precondition::provide_topic ${topic_name} precondition:provide_topic ${topic_name}
topic_path=${MEMO_FOLDER}/${topic_name} topic_path=${MEMO_FOLDER}/${topic_name}
echo "copy '${path}' to '${topic_name}'" echo "copy '${path}' to '${topic_name}'"
@ -328,7 +328,7 @@ EOF
command=$1 command=$1
shift shift
precondition::provide_memo_folder precondition:provide_memo_folder
git:status git:status
case $command in case $command in