From: Daniel Liu Date: Tue, 24 Nov 2020 05:24:15 +0000 (-0500) Subject: problems with sed X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=8642e09f89ab92d4d883dd882629cf5d8abee83f;p=pb.git problems with sed --- diff --git a/blog/templates/index_entry.html b/blog/templates/index_entry.html index 428e697..b460195 100644 --- a/blog/templates/index_entry.html +++ b/blog/templates/index_entry.html @@ -1 +1,2 @@

{{TITLE}}

+

antoher line

diff --git a/blogindex.html b/blogindex.html index 95cea42..de1cfe2 100644 --- a/blogindex.html +++ b/blogindex.html @@ -9,10 +9,6 @@

Blog index page

- -

lol

- - diff --git a/pb b/pb index a79e1c7..c3bee84 100755 --- a/pb +++ b/pb @@ -17,7 +17,7 @@ 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" @@ -76,12 +76,19 @@ 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 + # Add new entry to blog index (do something about indent??) - sed -i "// a\ - \n`cat "$data_dir/templates/$index_template" | sub "$to_publish"`\n" "$blog_index_file" + + # echo -e "//a \n\n$index_entry\n" + sed -i "//a \n${index_entry}\n" "$blog_index_file" mv "$data_dir/drafts/$to_publish.draft.html" "$data_dir/published/" + echo "Successfully published $to_publish" + } delete() { @@ -94,6 +101,7 @@ delete() { # remove entries from files echo -e "$blog_index_file\n$rolling_file\n$rss_file" | xargs sed -i "//,// d" + echo "Successfully deleted $to_delete" } # check to see if all required files are present @@ -103,10 +111,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;;