add favicon when building site

This commit is contained in:
Daniel Pavel 2013-05-22 01:25:45 +03:00
parent d46e603366
commit 4ba50267f1
3 changed files with 11 additions and 11 deletions

View File

@ -5,6 +5,7 @@
<meta name="description" content="{{ site.tagline }}" /> <meta name="description" content="{{ site.tagline }}" />
<link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css">
<link rel="icon" type="image/png" href="images/favicon.png" />
<title>{{ page.title }}</title> <title>{{ page.title }}</title>
</head> </head>

View File

@ -5,6 +5,7 @@
<meta name="description" content="{{ site.tagline }}" /> <meta name="description" content="{{ site.tagline }}" />
<link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css">
<link rel="icon" type="image/png" href="images/favicon.png" />
<title>{{ page.title }}</title> <title>{{ page.title }}</title>
</head> </head>

View File

@ -2,8 +2,6 @@
set -e set -e
BACKUPS=".git packages"
BUILD="$(mktemp -dt solaar-gh-pages-XXXXXX)" BUILD="$(mktemp -dt solaar-gh-pages-XXXXXX)"
cd "$(dirname "$0")"/.. cd "$(dirname "$0")"/..
SELF="$PWD" SELF="$PWD"
@ -57,6 +55,7 @@ fix_times() {
cp -upr "$SELF/jekyll"/* "$BUILD/" cp -upr "$SELF/jekyll"/* "$BUILD/"
cp -up "$SELF/share/solaar/icons/solaar-logo.png" "$BUILD/images/" cp -up "$SELF/share/solaar/icons/solaar-logo.png" "$BUILD/images/"
cp -up "$SELF/share/solaar/icons/solaar.png" "$BUILD/images/favicon.png"
add_md docs/devices.md add_md docs/devices.md
add_md docs/installation.md add_md docs/installation.md
@ -71,13 +70,15 @@ for l in "$BUILD/_layouts"/*.html; do
mv "$l=" "$l" mv "$l=" "$l"
done done
BACKUPS_DIR="$(mktemp -d --tmpdir="$SITE/.." backups-XXXXXX)" mkdir -p "$SITE/../packages"
for d in $BACKUPS; do cp -up "$SELF/dist/debian"/*.deb "$SITE/../packages/"
mv "$SITE/$d" "$BACKUPS_DIR"
done GIT_BACKUP="$(mktemp -ud --tmpdir="$SITE/.." git-backup-XXXXXX)"
mv "$SITE/.git" "$GIT_BACKUP"
jekyll --kramdown "$BUILD" "$SITE" jekyll --kramdown "$BUILD" "$SITE"
mv "$BACKUPS_DIR"/* "$BACKUPS_DIR"/.[a-z]* "$SITE/" mv "$GIT_BACKUP" "$SITE/.git"
rm -rf "$BACKUPS_DIR"
cp -al "$SITE/../packages/" "$SITE/"
for p in "$SITE"/*.html; do for p in "$SITE"/*.html; do
sed -i -e 's#^[ ]*##g' "$p" sed -i -e 's#^[ ]*##g' "$p"
@ -99,6 +100,3 @@ fix_times docs/installation.md installation.html
fix_times jekyll/images images fix_times jekyll/images images
fix_times share/solaar/icons/solaar-logo.png images/solaar-logo.png fix_times share/solaar/icons/solaar-logo.png images/solaar-logo.png
fix_times jekyll/style style fix_times jekyll/style style
mkdir -p "$SITE/packages"
cp -up "$SELF/dist/debian"/*.deb "$SITE/packages/"