mirror/cadmus
1
0
Fork 0
mirror of https://github.com/RyanGreenup/cadmus.git synced 2025-07-31 19:30:12 +02:00
Code Issues Releases Wiki Activity

Moved Config File to ~/.config/cadmus/config.json #11 #2

Browse Source 
(also fixed double enter bug in generator)
This commit is contained in:
ryangreenup
2020-07-24 01:47:39 +10:00
parent bfaba116a0
commit 2b6dae25c6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/cadmus
View File

@@ -3,7 +3,7 @@
readonly script_name=$(basename "${0}") readonly script_name=$(basename "${0}")
script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
readonly script_dir=$(realpath "${script_dir}""/""${script_name}" | xargs dirname) readonly script_dir=$(realpath "${script_dir}""/""${script_name}" | xargs dirname)
readonly CONFIG=$(realpath "${script_dir}/../config.json") # one directory above readonly CONFIG="$HOME/.config/cadmus/config.json" # one directory above
## readonly SERVER_DIR="/srv/www/html/MD" ## readonly SERVER_DIR="/srv/www/html/MD"
## readonly RECOLL_CONFIG_DIR="$HOME/.cadmus" ## readonly RECOLL_CONFIG_DIR="$HOME/.cadmus"
## readonly MKDOCS_YML="$HOME/Notes/mkdocs.yml" ## This may be above the notes directory, the ## readonly MKDOCS_YML="$HOME/Notes/mkdocs.yml" ## This may be above the notes directory, the
@@ -127,6 +127,7 @@ checkConfig () {
if [[ "${choice}" == "y" ]]; then if [[ "${choice}" == "y" ]]; then
config_json=$("${script_dir}/makeConfig.bash") config_json=$("${script_dir}/makeConfig.bash")
if [[ "${config_json}" != "" ]]; then if [[ "${config_json}" != "" ]]; then
[[ -d "$(dirname "${CONFIG}")" ]] || mkdir -p "$(dirname "${CONFIG}")"
echo "${config_json}" > "${CONFIG}" echo "${config_json}" > "${CONFIG}"
echo -e "This is the Config:\n" echo -e "This is the Config:\n"
highlight "${CONFIG}" highlight "${CONFIG}"

1
bin/makeConfig.bash
View File

@@ -96,7 +96,6 @@ AskValues () {
echoerr "\t (This directory should contain index.md or home.md)" echoerr "\t (This directory should contain index.md or home.md)"
read -e NOTES_DIR read -e NOTES_DIR
NOTES_DIR="$(echo "${NOTES_DIR/\~/$HOME}")" NOTES_DIR="$(echo "${NOTES_DIR/\~/$HOME}")"
read -d '' -s -n1 choice
# NOTES_DIR="$(cd /; sk --height 40% -i -c 'fd {}' )" # NOTES_DIR="$(cd /; sk --height 40% -i -c 'fd {}' )"
[[ -d "${NOTES_DIR}" ]] || echoerr -e "\n \e[3m\e[1m \e[1;31m ⚠ WARNING: \e[0m No Such Directory!" [[ -d "${NOTES_DIR}" ]] || echoerr -e "\n \e[3m\e[1m \e[1;31m ⚠ WARNING: \e[0m No Such Directory!"