The branch, master has been updated
via 4cd683b NEWS[SDC_and_IO_Lab]: Samba Team at SDC, Samba IO Lab
via befbc12 news scripts: allow for news stories to have snippets shown
on the front page
from 2fef43d Add Uri Simchoni to Samba team member list
https://git.samba.org/?p=samba-web.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4cd683b54def3ab621f44df96f85374b6a2efadf
Author: Jose A. Rivera <[email protected]>
Date: Fri Oct 2 16:46:21 2015 -0700
NEWS[SDC_and_IO_Lab]: Samba Team at SDC, Samba IO Lab
Signed-off-by: Jose A. Rivera <[email protected]>
commit befbc1286b565225e9281823ef26522155c4328d
Author: Jose A. Rivera <[email protected]>
Date: Fri Oct 2 21:48:08 2015 -0700
news scripts: allow for news stories to have snippets shown on the front
page
Signed-off-by: Jose A. Rivera <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
generated_news.sh | 13 ++++++---
images/samba_iolab_2015.jpg | Bin 0 -> 442178 bytes
images/sdc_2015.jpg | Bin 0 -> 384876 bytes
.../20151002-214522.SDC_and_IO_Lab.body.html | 31 +++++++++++++++++++++
.../20151002-214522.SDC_and_IO_Lab.headline.html | 3 ++
.../20151002-214522.SDC_and_IO_Lab.snip.html | 10 +++++++
prepare_news.sh | 25 ++++++++++++++++-
7 files changed, 77 insertions(+), 5 deletions(-)
create mode 100644 images/samba_iolab_2015.jpg
create mode 100644 images/sdc_2015.jpg
create mode 100644 posted_news/20151002-214522.SDC_and_IO_Lab.body.html
create mode 100644 posted_news/20151002-214522.SDC_and_IO_Lab.headline.html
create mode 100644 posted_news/20151002-214522.SDC_and_IO_Lab.snip.html
Changeset truncated at 500 lines:
diff --git a/generated_news.sh b/generated_news.sh
index e6001b2..a8652cd 100755
--- a/generated_news.sh
+++ b/generated_news.sh
@@ -23,10 +23,15 @@ generate() {
}
echo "${dst}: regenerating"
- files=$(find posted_news/ -type f -name "${filter}" -printf "%f\n" |
sort -r | head -${count} | xargs)
+ files=$(find posted_news/ -type f -regex "${filter}" -printf "%f\n" |
sort -r | xargs)
{
for f in ${files}; do
+ if [[ "$filter" == *snip* ]] && [[ "$f" ==
*".body.html"* ]] && [[ "$files" == *"${f%.body.html}.snip.html"* ]]; then
+ continue
+ fi
echo "<!--#include virtual=\"/samba/posted_news/${f}\"
-->"
+ count=$((count-1))
+ if [[ $count == 0 ]]; then break; fi
done
} > ${dst}
@@ -67,9 +72,9 @@ generate_latest_stable_release() {
mv ${dst}.tmp ${dst}
}
-generate "generated_news/latest_10_headlines.html" "10" "*.headline.html"
-generate "generated_news/latest_10_bodies.html" "10" "*.body.html"
-generate "generated_news/latest_2_bodies.html" "2" "*.body.html"
+generate "generated_news/latest_10_headlines.html" "10" ".*\.headline\.html"
+generate "generated_news/latest_10_bodies.html" "10" ".*\.body\.html"
+generate "generated_news/latest_2_bodies.html" "2" ".*\.\(snip\|body\)\.html"
download_url="https://download.samba.org/pub/samba/stable";
generate_latest_stable_release "generated_news/latest_stable_release.html"
"${download_url}"
diff --git a/images/samba_iolab_2015.jpg b/images/samba_iolab_2015.jpg
new file mode 100644
index 0000000..5f101ed
Binary files /dev/null and b/images/samba_iolab_2015.jpg differ
diff --git a/images/sdc_2015.jpg b/images/sdc_2015.jpg
new file mode 100644
index 0000000..6b310c6
Binary files /dev/null and b/images/sdc_2015.jpg differ
diff --git a/posted_news/20151002-214522.SDC_and_IO_Lab.body.html
b/posted_news/20151002-214522.SDC_and_IO_Lab.body.html
new file mode 100644
index 0000000..dbac37e
--- /dev/null
+++ b/posted_news/20151002-214522.SDC_and_IO_Lab.body.html
@@ -0,0 +1,31 @@
+<!-- BEGIN: posted_news/20151002-214522.SDC_and_IO_Lab.body.html -->
+<h5><a name="SDC_and_IO_Lab">02 October 2015</a></h5>
+<p class=headline>Samba Team at SDC, Samba IO Lab</p>
+<p>
+Today marks the end of two weeks of US-based hacking for several members of
+the Samba Team.
+</p>
+<!-- SNIP -->
+<div style="float: left; margin: .5em"><a
href="/samba/images/sdc_2015.jpg"><img
src="/samba/images/sdc_2015_thumb.jpg"></a></div>
+<p>
+Last week, a good part of the Team made its regular appearance at the Storage
+Network Industry Association (SNIA) Storage Developers Conference and the
+colocated SNIA SMB2/3 Protocol Plugfest in Santa Clara, CA. Many members gave
+presentations on the state of features and the project as a whole at the SDC,
+and many more leaned heavily over their keyboards fixing bugs and
+implementing last-minute features for their demos. We even welcomed a new
+member into our fold, so be sure to send him all your issues with printing.
+</p>
+<div style="float: right; margin: .5em"><a
href="/samba/images/samba_iolab_2015.jpg"><img
src="/samba/images/samba_iolab_2015_thumb.jpg"></a></div>
+<p>
+This past week a smaller contingent of Team members flew up to Microsoft
+campus in Redmond, WA for a Samba IO Lab. This was a much more intense period
+of hacking filled with discoveries, cursing, breakthroughs, and too much
+pizza. Expect to see the fruits of their labor in near-future releases!
+</p>
+<p>
+Our thanks go out to the companies, organization, and people that work so
+hard to enable, organize, and fund these events. We look forward to working
+with them during future events!
+</p>
+<!-- END: posted_news/20151002-214522.SDC_and_IO_Lab.body.html -->
diff --git a/posted_news/20151002-214522.SDC_and_IO_Lab.headline.html
b/posted_news/20151002-214522.SDC_and_IO_Lab.headline.html
new file mode 100644
index 0000000..21987e0
--- /dev/null
+++ b/posted_news/20151002-214522.SDC_and_IO_Lab.headline.html
@@ -0,0 +1,3 @@
+<!-- BEGIN: posted_news/20151002-214522.SDC_and_IO_Lab.headline.html -->
+<li> 02 October 2015 <a href="#SDC_and_IO_Lab">Samba Team at SDC, Samba IO
Lab</a></li>
+<!-- END: posted_news/20151002-214522.SDC_and_IO_Lab.headline.html -->
diff --git a/posted_news/20151002-214522.SDC_and_IO_Lab.snip.html
b/posted_news/20151002-214522.SDC_and_IO_Lab.snip.html
new file mode 100644
index 0000000..d21870a
--- /dev/null
+++ b/posted_news/20151002-214522.SDC_and_IO_Lab.snip.html
@@ -0,0 +1,10 @@
+
+<!-- BEGIN: posted_news/20151002-214522.SDC_and_IO_Lab.snip.html -->
+<h5><a name="SDC_and_IO_Lab">02 October 2015</a></h5>
+<p class=headline>Samba Team at SDC, Samba IO Lab</p>
+<p>
+Today marks the end of two weeks of US-based hacking for several members of
+the Samba Team.
+</p>
+<p><a href="/samba/latest_news.html#SDC_and_IO_Lab">(Read more)</a></p>
+<!-- END: posted_news/20151002-214522.SDC_and_IO_Lab.snip.html -->
diff --git a/prepare_news.sh b/prepare_news.sh
index 797bca2..31150a4 100755
--- a/prepare_news.sh
+++ b/prepare_news.sh
@@ -88,6 +88,7 @@ utctime=$(date --utc +"%Y%m%d-%H%M%S")
headlinefile="posted_news/${utctime}.${NAME}.headline.html"
bodyfile="posted_news/${utctime}.${NAME}.body.html"
+snipfile=""
echo "generating ${headlinefile}"
CLEANUP_FILES="${CLEANUP_FILES} ${headlinefile}"
{
@@ -108,6 +109,8 @@ CLEANUP_FILES="${CLEANUP_FILES} ${bodyfile}"
echo "<p>"
echo "<!-- TODO: add more context here -->"
echo "</p>"
+ echo "<!-- SNIP -->"
+ echo "<!-- TODO: remove the above line or move it to where you want the
front-page preview to end, also remove this comment -->"
echo "<!-- END: ${bodyfile} -->"
} > ${bodyfile}
@@ -116,9 +119,29 @@ LANG="${SAVE_LANG}" \
LANGUAGE="${SAVE_LANGUAGE}" \
${EDITOR} ${bodyfile}
+if grep -q "<!-- SNIP -->" $bodyfile; then
+ snipfile="posted_news/${utctime}.${NAME}.snip.html"
+ echo "generating ${snipfile}"
+ CLEANUP_FILES="${CLEANUP_FILES} ${snipfile}"
+ {
+ echo "<!-- BEGIN: ${snipfile} -->"
+ while read -r line || [[ -n "$line" ]]; do
+ if [[ $line == *"<!-- BEGIN"* ]]; then
+ continue
+ elif [[ $line == *"<!-- SNIP -->"* || $line == *"<!--
END"* ]]; then
+ echo ${line%%<!--*}"<p><a
href=\"/samba/latest_news.html#${NAME}\">(Read more)</a></p>"
+ break
+ else
+ echo $line
+ fi
+ done <"${bodyfile}"
+ echo "<!-- END: ${snipfile} -->"
+ } > ${snipfile}
+fi
+
CLEANUP_FILES=""
CLEANUP_RESET_COMMIT="HEAD"
-git add ${headlinefile} ${bodyfile}
+git add ${headlinefile} ${bodyfile} ${snipfile}
git commit --signoff --message "NEWS[${NAME}]: ${HEADLINE}"
CLEANUP_RESET_COMMIT="HEAD^"
--
Samba Website Repository
