caylakpenguen/bashblog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed extra './' strings bug introduced in last commit

Browse Source
This commit is contained in:
Carlos Fenollosa 2014-05-15 14:39:03 +02:00
parent 5bd63c9be3
commit 8f4951219e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bb.sh
View File

@ -418,7 +418,9 @@ twitter() {
# Return 0 (bash return value 'true') if the input file is am index, feed, etc # Return 0 (bash return value 'true') if the input file is am index, feed, etc
# or 1 (bash return value 'false') if it is a blogpost # or 1 (bash return value 'false') if it is a blogpost
is_boilerplate_file() { is_boilerplate_file() {
if [[ "$1" == "$index_file" ]] || [[ "$1" == "$archive_index" ]] || [[ "$1" == "$tags_index" ]] || [[ "$1" == "$footer_file" ]] || [[ "$1" == "$header_file" ]] || [[ "$1" == "$global_analytics_file" ]] || [[ "$1" = "$prefix_tags"* ]] ; then return 0 name="$1"
[[ "${name:0:2}" == "./" ]] && name=${name:2} # Delete leading './'
if [[ "$name" == "$index_file" ]] || [[ "$name" == "$archive_index" ]] || [[ "$name" == "$tags_index" ]] || [[ "$name" == "$footer_file" ]] || [[ "$name" == "$header_file" ]] || [[ "$name" == "$global_analytics_file" ]] || [[ "$name" = "$prefix_tags"* ]] ; then return 0
else return 1 else return 1
fi fi
} }
@ -743,7 +745,7 @@ rebuild_index() {
rebuild_tags() { rebuild_tags() {
echo -n "Rebuilding tag pages " echo -n "Rebuilding tag pages "
n=0 n=0
rm $prefix_tags*.html &> /dev/null rm ./$prefix_tags*.html &> /dev/null
# First we will process all files and create temporal tag files # First we will process all files and create temporal tag files
# with just the content of the posts # with just the content of the posts
for i in $(ls -t ./*.html); do for i in $(ls -t ./*.html); do
@ -771,7 +773,7 @@ rebuild_tags() {
done done
# Now generate the tag files with headers, footers, etc # Now generate the tag files with headers, footers, etc
for i in $(ls -t ./$prefix_tags*.tmp.html); do for i in $(ls -t ./$prefix_tags*.tmp.html); do
tagname="$(echo $i | cut -c $((${#prefix_tags}+1))- | sed 's/\.tmp\.html//g')" tagname="$(echo $i | cut -c $((${#prefix_tags}+3))- | sed 's/\.tmp\.html//g')"
create_html_page "$i" "$prefix_tags$tagname.html" yes "$global_title — $template_tag_title \"$tagname\"" create_html_page "$i" "$prefix_tags$tagname.html" yes "$global_title — $template_tag_title \"$tagname\""
rm "$i" rm "$i"
done done