X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=pb;h=3bc32e98e517587a0eb7181828a06fce90a4993c;hb=45bbbdd54e52f76ac3d9c1a03b807f9337d0a559;hp=c3bee842fcc5d1c4232c7c4167545751b5d7abb2;hpb=8642e09f89ab92d4d883dd882629cf5d8abee83f;p=pb.git
diff --git a/pb b/pb
index c3bee84..3bc32e9 100755
--- a/pb
+++ b/pb
@@ -22,8 +22,8 @@ init() {
mkdir -p "$data_dir/drafts" "$data_dir/published" "$data_dir/html" "$data_dir/templates"
- echo '
{{TITLE}}
' >> "$data_dir/templates/$index_template"
- echo -e '' >> "$data_dir/templates/$rolling_template"
+ echo '{{TITLE}}
' >> "$data_dir/templates/$index_template"
+ echo -e '\n
{{TITLE}}
\n
{{DATE}}
\n
{{BODY}}
\n
' >> "$data_dir/templates/$rolling_template"
echo -e '- \n{{TITLE}}\n\n<\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 "//,//{//!{//!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 " |\
+ sed "\$a " |\
sed "s|{{TITLE}}|$1|g;
s|{{DATE}}|`date +'%a, %b %d %H:%M'`|g;
s|{{URL}}|$website_url/$1|g" |\
@@ -76,14 +78,17 @@ publish() {
cat $blog_template | sub "$to_publish" \
> "$data_dir/html/$to_publish.html"
- index_entry="$(cat "$data_dir/templates/$index_template" | sub "$to_publish")"
-
- #sed is breaking when trying to add multiple lines for some reason
+ 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??)
-
- # echo -e "//a \n\n$index_entry\n"
- sed -i "//a \n${index_entry}\n" "$blog_index_file"
+ sed -i "//r $temp_index" "$blog_index_file"
+ sed -i "//r $temp_rolling" "$rolling_file"
+ sed -i "//r $temp_rss" "$rss_file"
mv "$data_dir/drafts/$to_publish.draft.html" "$data_dir/published/"