xenami/vns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected issues arising from "$BASE_DIR" vs "$ROOT_DIR"

Browse Source
This commit is contained in:
Jon-William Lewis
2016-01-25 23:41:41 -06:00
parent 238934c979
commit 77c3398c5f
8 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
header.sh
View File

@@ -15,7 +15,7 @@ if [ -z "\$HOME" ]; then HOME=/home/"\$(whoami)"; fi
PROD_STR="$PROD_STR" PROD_STR="$PROD_STR"
readonly VER_STR="$VER_STR" readonly VER_STR="$VER_STR"
readonly ROOT_DIR="\$HOME"/.config/xenlabs/sns readonly ROOT_DIR="\$HOME"/.config/xenlabs/sns
readonly BASE_DIR="\$ROOT_DIR"/notes readonly NOTES_DIR="\$ROOT_DIR"/notes
readonly TMP_DIR="\$ROOT_DIR"/tmp readonly TMP_DIR="\$ROOT_DIR"/tmp
readonly CONFIG_FILE="\$ROOT_DIR/sns.conf" readonly CONFIG_FILE="\$ROOT_DIR/sns.conf"

43
sns.sh
View File

@@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash
#========================================================== #==========================================================
# Simple Note System, v2.0a7 # Simple Note System, v2.0a8
# Copyright 2014, Xenese Labs/Sicron-Perion XNF # Copyright 2014, Xenese Labs/Sicron-Perion XNF
#========================================================== #==========================================================
if [ -z "$HOME" ]; then HOME=/home/"$(whoami)"; fi if [ -z "$HOME" ]; then HOME=/home/"$(whoami)"; fi
PROD_STR="Simple Note System" PROD_STR="Simple Note System"
readonly VER_STR="v2.0a7" readonly VER_STR="v2.0a8"
readonly ROOT_DIR="$HOME"/.config/xenlabs/sns readonly ROOT_DIR="$HOME"/.config/xenlabs/sns
readonly BASE_DIR="$ROOT_DIR"/notes readonly NOTES_DIR="$ROOT_DIR"/notes
readonly TMP_DIR="$ROOT_DIR"/tmp readonly TMP_DIR="$ROOT_DIR"/tmp
readonly CONFIG_FILE="$ROOT_DIR/sns.conf" readonly CONFIG_FILE="$ROOT_DIR/sns.conf"
@@ -23,7 +23,7 @@ if [ ! -d "$TMP_DIR" ]; then mkdir -p "$TMP_DIR" ; fi
cat > "$CONFIG_FILE" << EOF cat > "$CONFIG_FILE" << EOF
#========================================================== #==========================================================
# Simple Note System Config, v2.0a5 # Simple Note System Config, v2.0a8
# Copyright 2014, Xenese Labs/Sicron-Perion XNF # Copyright 2014, Xenese Labs/Sicron-Perion XNF
#========================================================== #==========================================================
@@ -72,19 +72,18 @@ function p_header(){
printf "TITLE: %s\nDATE: %s\n" "$NAME" "$(date)" printf "TITLE: %s\nDATE: %s\n" "$NAME" "$(date)"
} }
function encrypt(){ function encrypt(){
# This function, given a recipient, $PUBKEY; a file to encrypt, $TARGET; and an # This function, given a recipient, $PUBKEY; a file to encrypt, $TMP_NOTE; and an
# output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private # output file, "$NOTE", will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
# GPG key. # GPG key.
gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET" gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE"
} }
function decrypt(){ function decrypt(){
# This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an # This function, given a recipient, $PUBKEY; a file to decrypt, $TMP_NOTE; and an
# output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private # output file, "$NOTE", will decrpyt $TMP_NOTE to $NOTE against $PUBKEY's private
# GPG key. # GPG key.
echo "$NOTE"; pause
gpg -d "$NOTE" gpg -d "$NOTE"
} }
function create(){ function create(){
@@ -99,8 +98,8 @@ function create(){
echo "TITLE: $NAME" > "$NOTE" echo "TITLE: $NAME" > "$NOTE"
echo "DATE: $(date)" >> "$NOTE" echo "DATE: $(date)" >> "$NOTE"
elif [ "$ENCRYPTION" == "TRUE" ]; then elif [ "$ENCRYPTION" == "TRUE" ]; then
TARGET="$TMP_DIR"/"$SESSION_ID" TMP_NOTE="$TMP_DIR"/"$SESSION_ID"
p_header > "$TARGET" p_header > "$TMP_NOTE"
encrypt encrypt
fi fi
@@ -132,14 +131,14 @@ fi
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
cp "$NOTE" "$NOTE".bk cp "$NOTE" "$NOTE".bk
if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
TARGET="$TMP_DIR/$SESSION_ID" TMP_NOTE="$TMP_DIR/$SESSION_ID"
decrypt > "$TARGET" decrypt > "$TMP_NOTE"
else TARGET="$NOTE"; fi else TMP_NOTE="$NOTE"; fi
if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TARGET"; fi if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TMP_NOTE"; fi
"$EDITOR" "$TARGET" "$EDITOR" "$TMP_NOTE"
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
rm "$NOTE" rm "$NOTE"
@@ -161,9 +160,9 @@ function print(){
fi fi
} }
function list(){ function list(){
if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then if [ -d "$NOTES_DIR"/"$NOTEBOOK" ]; then
printf "+%s\n" "$NOTEBOOK" printf "+%s\n" "$NOTEBOOK"
find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do find "$NOTES_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )" printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
done done
fi fi
@@ -201,8 +200,8 @@ fi
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
PROD_STR="Simple Note System (Encryption Enabled)" PROD_STR="Simple Note System (Encryption Enabled)"
if [ ! -d "$BASE_DIR"/tmp ]; then if [ ! -d "$ROOT_DIR"/tmp ]; then
mkdir -p "$BASE_DIR"/tmp mkdir -p "$ROOT_DIR"/tmp
fi fi
fi fi
@@ -288,7 +287,7 @@ if [ -z "$NAME" ]; then
fi fi
SESSION_ID="$RANDOM" SESSION_ID="$RANDOM"
NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/ NOTE_DIR="$NOTES_DIR"/"$NOTEBOOK"/"$SECTION"/
if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg

4
src/includes/create.sns.sh
View File

@@ -10,8 +10,8 @@ function create(){
echo "TITLE: $NAME" > "$NOTE" echo "TITLE: $NAME" > "$NOTE"
echo "DATE: $(date)" >> "$NOTE" echo "DATE: $(date)" >> "$NOTE"
elif [ "$ENCRYPTION" == "TRUE" ]; then elif [ "$ENCRYPTION" == "TRUE" ]; then
TARGET="$TMP_DIR"/"$SESSION_ID" TMP_NOTE="$TMP_DIR"/"$SESSION_ID"
p_header > "$TARGET" p_header > "$TMP_NOTE"
encrypt encrypt
fi fi

10
src/includes/edit.sns.sh
View File

@@ -7,14 +7,14 @@ fi
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
cp "$NOTE" "$NOTE".bk cp "$NOTE" "$NOTE".bk
if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
TARGET="$TMP_DIR/$SESSION_ID" TMP_NOTE="$TMP_DIR/$SESSION_ID"
decrypt > "$TARGET" decrypt > "$TMP_NOTE"
else TARGET="$NOTE"; fi else TMP_NOTE="$NOTE"; fi
if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TARGET"; fi if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TMP_NOTE"; fi
"$EDITOR" "$TARGET" "$EDITOR" "$TMP_NOTE"
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
rm "$NOTE" rm "$NOTE"

11
src/includes/libencryption.sh
View File

@@ -1,16 +1,15 @@
function encrypt(){ function encrypt(){
# This function, given a recipient, $PUBKEY; a file to encrypt, $TARGET; and an # This function, given a recipient, $PUBKEY; a file to encrypt, $TMP_NOTE; and an
# output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private # output file, "$NOTE", will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
# GPG key. # GPG key.
gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET" gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE"
} }
function decrypt(){ function decrypt(){
# This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an # This function, given a recipient, $PUBKEY; a file to decrypt, $TMP_NOTE; and an
# output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private # output file, "$NOTE", will decrpyt $TMP_NOTE to $NOTE against $PUBKEY's private
# GPG key. # GPG key.
echo "$NOTE"; pause
gpg -d "$NOTE" gpg -d "$NOTE"
} }

4
src/includes/list.sns.sh
View File

@@ -1,7 +1,7 @@
function list(){ function list(){
if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then if [ -d "$NOTES_DIR"/"$NOTEBOOK" ]; then
printf "+%s\n" "$NOTEBOOK" printf "+%s\n" "$NOTEBOOK"
find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do find "$NOTES_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )" printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
done done
fi fi

4
src/main/stage1.sns.sh
View File

@@ -20,8 +20,8 @@ fi
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
PROD_STR="Simple Note System (Encryption Enabled)" PROD_STR="Simple Note System (Encryption Enabled)"
if [ ! -d "$BASE_DIR"/tmp ]; then if [ ! -d "$ROOT_DIR"/tmp ]; then
mkdir -p "$BASE_DIR"/tmp mkdir -p "$ROOT_DIR"/tmp
fi fi
fi fi

2
src/main/stage3.sns.sh
View File

@@ -22,7 +22,7 @@ if [ -z "$NAME" ]; then
fi fi
SESSION_ID="$RANDOM" SESSION_ID="$RANDOM"
NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/ NOTE_DIR="$NOTES_DIR"/"$NOTEBOOK"/"$SECTION"/
if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg