Tools update for build using podman.

Author: pvalena

common.sh

@@ -141,13 +141,26 @@ buildsite () {
   grep -v "Build Warning: Layout 'content' requested in" <<< "$O"
   [[ -n "$f" ]] && die "Jekyll build failed!"
 
+  cleanup
+}
+
+cleanup () {
+  local Y="website/_site"
+  local X="`getd "$Y"`"
+
+  scd 'website'
+
   [[ -d "$X" ]] || die "'$X' does not exist!"
+
   find "$X" -type f -iname '*.html' | while read z; do
     TMP="`ruby -ne 'BEGIN{ \$pre = false } ; x = \$_ ; \$pre = ( (x =~ /<pre/i) || (\$pre && !(x =~ /<\/pre/i) ) ) ; print unless (!\$pre && x =~ /^\s*$/)' < "$z"`"
 
     echo "$TMP" > "$z"
     TMP=
   done
+
+  # Fixup urls
+  grep -r 'http://0\.0\.0\.0:4000/' "$X" -l | xargs -n1 sed -i 's|http://0\.0\.0\.0\:4000|https://developer.fedoraproject.org|g'
 }
 
 addmsg () {

container.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# ./commit.sh [common]
+#   Prepare staging branch for release.
+#   Does only local changes.
+#   For common options, see './common.sh -h'.
+#
+
+ . $(dirname "`readlink -e "$0"`")/common.sh || exit 1
+
+  MSG='Content & Website update\n'
+
+  scd "website"
+
+  # container run
+  vrun 'docker run -it --rm -p4000:4000 -v $PWD:/opt/developerportal/website:Z pvalena/developer-portal'
+
+  vrun 'echo > _includes/announcement.html'
+
+  # container copy
+  vrun 'podman container cp "`podman ps -lq`:/opt/developerportal/website/_site/" .'
+
+  cleanup
+
+  prepgit master
+
+  vrun 'podman stop -l'
+
+  logg "Done\n"

display-diff.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+git diff -w | grep -vE '^-\s*$' | grep -vE '^ ' | grep -vE '^index ' | grep -vE '^\+\+\+ ' | grep -vE '^\-\-\- ' | colordiff
+

links.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# ./links.sh [common] [-s]
+#   Git diff to links.
+#   Does not do any changes.
+#   For common options, see './common.sh -h'.
+#
+#   -s    output for staging server
+#
+
+ . $(dirname "`readlink -e "$0"`")/common.sh &>/dev/null || exit 1
+
+  U1='https://developer.'
+  U2='fedoraproject.org/'
+
+  stg=
+  ind=
+  c=0
+  br=release
+
+  [[ "$1" == '-s' ]] && { stg='stg.' ; ind='  ' ; shift ; }
+
+  [[ -n "$1" ]] || die "Commit missing"
+
+  URL="$U1$stg$U2"
+
+  scd "website/content"
+
+  set -o pipefail
+
+  git diff --stat "$1" \
+    | head -n -1 \
+    | sed -e 's/^[\. ]*//g' \
+    | cut -d' ' -f1 \
+    | xargs -i bash -c "
+        f='{}'
+        [[ -r \"\$f\" ]] || \
+          f=\"\$( find -name \"\$(basename \"\$f\")\" | grep \"\$f$\" | head -1 | cut -d'/' -f2- )\"
+        [[ -r \"\$f\" ]] || exit 255
+
+        f=\"\$(rev <<< \"\$f\" | cut -d'.' -f2- | rev)\"
+        echo \"  ${URL}\${f}.html\"
+      "