From 5783929943722f94a2a0553fac869f37537bbffb Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Mon, 5 Sep 2016 21:47:09 -0700 Subject: [PATCH 1/5] build.sh: Support comments in package files This patch allows the use of hash comments inside patch files. It's a little ugly, but it strips comments and collapses all whitespace down to single space characters between package names. It handles comments anywhere in a line, as well. Was unsure if \ continuation of the long sed line or the inclusion of a couple of lines of comments explaining what the sed expressions are doing would be appreciated, so didn't include them in this patch. --- build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5b745e8..2492a47 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,8 @@ EOF fi if [ -f ${i}-packages-nr ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" - PACKAGES=`cat $i-packages-nr | tr '\n' ' '` + PACKAGES="$(sed -e ':a;N;$ !b a' -e 's/[[:space:]]*\(#[^\n]*\)*[[:space:]]/ /g' < ${i}-packages-nr)" + if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install --no-install-recommends -y $PACKAGES @@ -26,7 +27,7 @@ EOF fi if [ -f ${i}-packages ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages" - PACKAGES=`cat $i-packages | tr '\n' ' '` + PACKAGES="$(sed -e ':a;N;$ !b a' -e 's/[[:space:]]*\(#[^\n]*\)*[[:space:]]/ /g' < ${i}-packages)" if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install -y $PACKAGES From 34d3bc7dcca36de7c6b970c367559f829600d4e6 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Mon, 5 Sep 2016 21:55:48 -0700 Subject: [PATCH 2/5] build.sh: whitespace fix --- build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sh b/build.sh index 2492a47..2803291 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,6 @@ EOF if [ -f ${i}-packages-nr ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" PACKAGES="$(sed -e ':a;N;$ !b a' -e 's/[[:space:]]*\(#[^\n]*\)*[[:space:]]/ /g' < ${i}-packages-nr)" - if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install --no-install-recommends -y $PACKAGES From 7dfff846a163408c405d9248596baff29b75c084 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 6 Sep 2016 12:20:43 -0700 Subject: [PATCH 3/5] build.sh: Use sed script for packages files Broke the sed expressions out of build.sh and put them their own documented sed script. This greatly improves readability and avoids build.sh getting messier. Broke the substitution command into two separate subs. The first just deletes comments, and the second collapses all whitespace into a single space. This too is easier to read, and catches a couple of edge cases that would result it not all whitespace being collapsed. The result may still have (one) leading and/or trailing space, which is acceptable. --- build.sh | 6 ++++-- scripts/remove-comments.sed | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 scripts/remove-comments.sed diff --git a/build.sh b/build.sh index 2803291..52f7a82 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,8 @@ EOF fi if [ -f ${i}-packages-nr ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" - PACKAGES="$(sed -e ':a;N;$ !b a' -e 's/[[:space:]]*\(#[^\n]*\)*[[:space:]]/ /g' < ${i}-packages-nr)" + PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages-nr)" + PACKAGES="$(sed -e "$sed_expr_packages" < ${i}-packages-nr)" if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install --no-install-recommends -y $PACKAGES @@ -26,7 +27,7 @@ EOF fi if [ -f ${i}-packages ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages" - PACKAGES="$(sed -e ':a;N;$ !b a' -e 's/[[:space:]]*\(#[^\n]*\)*[[:space:]]/ /g' < ${i}-packages)" + PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages)" if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install -y $PACKAGES @@ -77,6 +78,7 @@ EOF log "End ${SUB_STAGE_DIR}" } + run_stage(){ log "Begin ${STAGE_DIR}" STAGE=$(basename ${STAGE_DIR}) diff --git a/scripts/remove-comments.sed b/scripts/remove-comments.sed new file mode 100644 index 0000000..2a6889f --- /dev/null +++ b/scripts/remove-comments.sed @@ -0,0 +1,11 @@ +# Deletes comments and collapses whitespace in ##-packages files + +# Append (N)ext line to buffer +# if (!)not ($)buffer is EOF, (b)ranch to (:)label loop +:loop +N +$ !b loop + +# Buffer is "line1\nline2\n...lineN", del comments and collapse whitespace +s/#[^\n]*//g +s/[[:space:]]\{1,\}/ /g From abc3e45727d0ed1a7804ed68a8a1c1b096b8372c Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Wed, 7 Sep 2016 13:32:36 -0700 Subject: [PATCH 4/5] build.sh: Support comments in package files (#14) * build.sh: Support comments in package files This patch allows the use of hash comments inside patch files. It's a little ugly, but it strips comments and collapses all whitespace down to single space characters between package names. It handles comments anywhere in a line, as well. Was unsure if \ continuation of the long sed line or the inclusion of a couple of lines of comments explaining what the sed expressions are doing would be appreciated, so didn't include them in this patch. * build.sh: whitespace fix * build.sh: Use sed script for packages files Broke the sed expressions out of build.sh and put them their own documented sed script. This greatly improves readability and avoids build.sh getting messier. Broke the substitution command into two separate subs. The first just deletes comments, and the second collapses all whitespace into a single space. This too is easier to read, and catches a couple of edge cases that would result it not all whitespace being collapsed. The result may still have (one) leading and/or trailing space, which is acceptable. --- build.sh | 6 ++++-- scripts/remove-comments.sed | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 scripts/remove-comments.sed diff --git a/build.sh b/build.sh index 5b745e8..52f7a82 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,8 @@ EOF fi if [ -f ${i}-packages-nr ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" - PACKAGES=`cat $i-packages-nr | tr '\n' ' '` + PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages-nr)" + PACKAGES="$(sed -e "$sed_expr_packages" < ${i}-packages-nr)" if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install --no-install-recommends -y $PACKAGES @@ -26,7 +27,7 @@ EOF fi if [ -f ${i}-packages ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages" - PACKAGES=`cat $i-packages | tr '\n' ' '` + PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages)" if [ -n "$PACKAGES" ]; then on_chroot sh -e - << EOF apt-get install -y $PACKAGES @@ -77,6 +78,7 @@ EOF log "End ${SUB_STAGE_DIR}" } + run_stage(){ log "Begin ${STAGE_DIR}" STAGE=$(basename ${STAGE_DIR}) diff --git a/scripts/remove-comments.sed b/scripts/remove-comments.sed new file mode 100644 index 0000000..2a6889f --- /dev/null +++ b/scripts/remove-comments.sed @@ -0,0 +1,11 @@ +# Deletes comments and collapses whitespace in ##-packages files + +# Append (N)ext line to buffer +# if (!)not ($)buffer is EOF, (b)ranch to (:)label loop +:loop +N +$ !b loop + +# Buffer is "line1\nline2\n...lineN", del comments and collapse whitespace +s/#[^\n]*//g +s/[[:space:]]\{1,\}/ /g From 46582b4a2e654e211070db0188a9c814ea97ac78 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Fri, 9 Sep 2016 23:15:41 -0700 Subject: [PATCH 5/5] README.md: Improve clarity of Raspbian stage 4 Changes suggested by Landrash, thanks! --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ff754f..2599f5a 100644 --- a/README.md +++ b/README.md @@ -71,5 +71,8 @@ maintenance and allows for more easy customization. enhancements, etc. This is a base desktop system, with some development tools installed. - - Stage 4, complete Raspbian system. More development tools, large packages - like LibreOffice, email, sonic-pi, wolfram-engine, etc. All the things. + - Stage 4, complete Raspbian system. More development tools, an email + client, learning tools like Scratch, specialized packages like sonic-pi and + wolfram-engine, system documentation, office productivity, etc. This is + the stage that installs all of the things that make Raspbian friendly to + new users.