scripts/config.sh

@@ -1,26 +0,0 @@
-#!/usr/local/bin/bash
-
-
-export PROJ_DIR=~/Notes
-export JOURNAL_DIR=$PROJ_DIR/wikis
-export SCRIPT_DIR=$PROJ_DIR/scripts
-export FILES_DIR=$PROJ_DIR/files
-export SUBJECTS_DIR=$PROJ_DIR/subjects
-export UTILS_DIR=$SCRIPT_DIR/utils
-
-function import () {
-	local SCRIPT_NAME="${1:?"import : script name not provided"}"
-	local SCRIPT_PATH=$UTILS_DIR/$SCRIPT_NAME
-
-	if [[ ! "$SCRIPT_PATH" =~ ^.*\.sh$ ]]; then
-		SCRIPT_PATH+=".sh"
-	fi
-
-	if [[ -f $SCRIPT_PATH ]]; then
-		. $SCRIPT_PATH
-	else
-		echo "import : $SCRIPT_PATH does not exist. Exiting program"
-		exit 1
-	fi
-
-}

scripts/make_new.sh

@@ -4,7 +4,7 @@ cd $JOURNAL_DIR
 DATE=`date +'%Y-%m-%d'`
 FILE="$JOURNAL_DIR/$DATE.wiki"
 
-import journals
+[[ -f $SCRIPT_DIR/utils/journals.sh ]] && . $SCRIPT_DIR/utils/journals.sh
 
 # Getting the last journal entry file
 declare -a journals

scripts/new_hook.sh

@@ -1,8 +1,10 @@
 #!/usr/local/bin/bash
 
-cd `dirname $0`
+export PROJECT_DIR=~/Notes
+export SCRIPT_DIR=$PROJECT_DIR/scripts
+export JOURNAL_DIR=$PROJECT_DIR/wikis
 
-[[ -f config.sh ]] && . config.sh
+cd $SCRIPT_DIR
 
 ./make_new.sh
-./update_hook.sh
+./update_all.sh