X-Git-Url: https://git.danieliu.xyz/?p=pb.git;a=blobdiff_plain;f=pb;h=3bc32e98e517587a0eb7181828a06fce90a4993c;hp=a79e1c7cc3ba1b16ca9695d0192f34a2a7cb448b;hb=45bbbdd54e52f76ac3d9c1a03b807f9337d0a559;hpb=0165e977bd372d0c1e162867961a1102ec6eadce

diff --git a/pb b/pb
index a79e1c7..3bc32e9 100755
--- a/pb
+++ b/pb
@@ -17,13 +17,13 @@ rss_template="rss_entry.html"
 [ ! -z "$EDITOR" ] && EDITOR="vim"
 
 init() {
-    read -p "Initialize blog? [y/n] " ask
+    read -p "Initialize blog here? [y/n] " ask
     [ "$ask" != "y" ] && exit 0
 
     mkdir -p "$data_dir/drafts" "$data_dir/published" "$data_dir/html" "$data_dir/templates" 
 
-    echo '<p id="{{TITLE}}">{{TITLE}}</p>' >> "$data_dir/templates/$index_template"
-    echo -e '<div id="{{TITLE}}">\n<h2>{{TITLE}}</h2>\n<p>{{DATE}}</p></div>' >> "$data_dir/templates/$rolling_template"
+    echo '<p>{{TITLE}}</p>' >> "$data_dir/templates/$index_template"
+    echo -e '<div>\n<h2>{{TITLE}}</h2>\n<p>{{DATE}}</p>\n<p>{{BODY}}</p>\n</div>' >> "$data_dir/templates/$rolling_template"
     echo -e '<item>\n<title>{{TITLE}}</title>\n<link></link>\n<description><\description>\n<\item>' \
         >> "$data_dir/templates/$rss_template"
 
@@ -33,24 +33,26 @@ init() {
 refresh() {
 
     read -p "Are you sure you want to refresh? [y/n] " ask
-    [ "$ask" != "y" ] && exit 0
+    [ "$ask" != "y" ] && echo "Aborting..." && exit 0
 
     # delete everything between tokens (remove dupe code)
     echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "/<!-- BLOG START -->/,/<!-- BLOG END -->/{/<!-- BLOG START -->/!{/<!-- BLOG END -->/!d}}"
 
     # deletes all html files and republishes all published files
-
-    echo "Refreshed."
+    echo "Successfully refreshed."
 }
 
 new() {
     [ -z "$1" ] && echo "Please give your blog post a name (you should put it inside quotations)" && exit 1 
-    sanitized=`echo -n "$1" | sed -e 's/[^A-Za-z0-9 _-]//g'| sed -e 's/ /-/g'`
+    sanitized=`echo -n "$1" | sed -e 's/[^A-Za-z0-9 _-]//g'`
+    [ -f "$data_dir/drafts/$sanitized.draft.html" ] && echo "Blog of that name already exists." && exit 1
     $EDITOR "$data_dir/drafts/$sanitized.draft.html"
 }
 
 sub() {
     cat - |\
+        sed "1i <!-- ID:$1 START -->" |\
+        sed  "\$a <!-- ID:$1 END -->" |\
         sed "s|{{TITLE}}|$1|g;
             s|{{DATE}}|`date +'%a, %b %d %H:%M'`|g;
             s|{{URL}}|$website_url/$1|g" |\
@@ -76,12 +78,22 @@ publish() {
     cat $blog_template | sub "$to_publish" \
        > "$data_dir/html/$to_publish.html" 
 
+    temp_index="$(mktemp)" # probably bad idea
+    cat "$data_dir/templates/$index_template" | sub "$to_publish" >> $temp_index
+    temp_rolling="$(mktemp)" 
+    cat "$data_dir/templates/$rolling_template" | sub "$to_publish" >> $temp_rolling
+    temp_rss="$(mktemp)" 
+    cat "$data_dir/templates/$rss_template" | sub "$to_publish" >> $temp_rss
+
     # Add new entry to blog index (do something about indent??)
-    sed -i "/<!-- BLOG START -->/ a\
-        <!-- ID:$to_publish START -->\n`cat "$data_dir/templates/$index_template" | sub "$to_publish"`\n<!-- ID:$to_publish END -->" "$blog_index_file"
+    sed -i "/<!-- BLOG START -->/r $temp_index" "$blog_index_file"
+    sed -i "/<!-- BLOG START -->/r $temp_rolling" "$rolling_file"
+    sed -i "/<!-- BLOG START -->/r $temp_rss" "$rss_file"
 
     mv "$data_dir/drafts/$to_publish.draft.html" "$data_dir/published/"
 
+    echo "Successfully published $to_publish"
+
 }
 
 delete() {
@@ -94,6 +106,7 @@ delete() {
     # remove entries from files 
     echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "/<!-- ID:$to_delete START -->/,/<!-- ID:$to_delete END -->/ d"
 
+    echo "Successfully deleted $to_delete"
 }
 
 # check to see if all required files are present
@@ -103,10 +116,9 @@ delete() {
 
 
 # check if blog dir exists
-[ ! -d $data_dir ]  && init
+[ ! -d $data_dir ]  && init && exit
 
 case $1 in
-    i|init) init;;
     n|new) new "$2";;
     p|publish) publish;;
     d|delete) delete;;