janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

jw-pkg: Add command compile-templates

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-09 13:18:48 +00:00
commit 246246573f
1 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

85
scripts/jw-pkg
View file

@ -20,19 +20,20 @@ cat << EOT
command is one of command is one of
help: show this help screen help: show this help screen
init: initialize init: initialize
uninit: undo initialization uninit: undo initialization
install: install packages in [arguments] install: install packages in [arguments]
update: update all jannet software on the system update: update all jannet software on the system
restore: restore a previous jannet software version state restore: restore a previous jannet software version state
info: query information about installed software packages info: query information about installed software packages
info-projects: query information about installed software projects info-projects: query information about installed software projects
checklog: update the installation log file if necessary checklog: update the installation log file if necessary
rpmnew: remove superfluous rpmnew files and show conflicts rpmnew: remove superfluous rpmnew files and show conflicts
for others for others
build-date: show installed jannet packages along with build date build-date: show installed jannet packages along with build date
built-today: show installed jannet packages that were built today built-today: show installed jannet packages that were built today
compile-templates: compile templates
global options are global options are
@ -90,7 +91,7 @@ list_packages()
{ {
local names="$1" local names="$1"
local rpm_args local rpm_args
if [ "$names" ]; then if [ -n "$names" ]; then
rpm_args="$rpm_args $names" rpm_args="$rpm_args $names"
else else
rpm_args="$rpm_args -a" rpm_args="$rpm_args -a"
@ -103,7 +104,7 @@ list_packages()
list_projects() list_projects()
{ {
list_packages "$@" | xargs rpm -qa --queryformat '%{SOURCERPM}: %{URL}\n' | \ list_packages "$@" | xargs -r rpm -q --queryformat '%{SOURCERPM}: %{URL}\n' | \
sed 's/\(^[^ ]\+\) *:.*/\1/; s/[ ]*$//; s/-[0-9]\+.*//' |\ sed 's/\(^[^ ]\+\) *:.*/\1/; s/[ ]*$//; s/-[0-9]\+.*//' |\
sort -u sort -u
} }
@ -113,7 +114,7 @@ cmd_rpmnew()
local file local file
list_packages "$@" | list_packages "$@" |
xargs rpm -ql | xargs -r rpm -ql |
while read file; do while read file; do
if [ -e "$file.rpmnew" ]; then if [ -e "$file.rpmnew" ]; then
if diff -q $file $file.rpmnew; then if diff -q $file $file.rpmnew; then
@ -137,7 +138,7 @@ cmd_diff()
local file local file
list_packages "$@" | list_packages "$@" |
xargs rpm -qV | xargs -r rpm -qV |
sed '/^....L\|^..5/ !d; s%[^/]*/%/%' | sed '/^....L\|^..5/ !d; s%[^/]*/%/%' |
while read file; do while read file; do
if diff -q $file $file.rpmnew; then if diff -q $file $file.rpmnew; then
@ -158,7 +159,7 @@ cmd_diff()
cmd_build_date() cmd_build_date()
{ {
list_packages "$@" | list_packages "$@" |
xargs rpm -q --queryformat '%{BUILDTIME} %{NAME}\n' | xargs -r rpm -q --queryformat '%{BUILDTIME} %{NAME}\n' |
sort -n | sort -n |
sed 's/-run\|-devel//' | sed 's/-run\|-devel//' |
sort -u | sort -u |
@ -167,6 +168,45 @@ cmd_build_date()
done done
} }
cmd_compile_templates()
{
local ext_from=".jw-tmpl"
local ext_to=""
local ext_tables=".jw-secret .jw-vars"
local group=root
local owner=root
local mode=600
local ext_from_re=`echo $ext_from | sed 's/\./\\./g'`
# TODO: allow target file attributes to be specified in options
umask 0077
local f
list_packages "$@" | xargs -r rpm -ql | while read f; do
echo searching $ext_from_re in $f
echo $f | grep -q "$ext_from_re$" || continue
local base=`echo $f | sed "s/$ext_from_re$//"`
local to=$base$ext_to
local table="" ext
for ext in $ext_tables; do
table=$base$ext
[ -f "$table" ] && break
done
[ -f $table ] || {
echo "WARNING: No key-value table found for template $f, not compiling." >&2
continue
}
# TODO: use mktemp -d and keep temporary files in read-only dir
local tmp=$to.tmp
echo "Applying macros in $table to $f."
sed 's|\([^ ]\+\) \(.*\)|s/\1/\2/g|' $table | sed -f - $f > $tmp
chmod $mode $tmp
chown $owner $tmp
chgrp $owner $tmp
mv $tmp $to
done
}
cmd_built_today() cmd_built_today()
{ {
local today=`date +'%Y-%m-%d'` local today=`date +'%Y-%m-%d'`
@ -222,9 +262,9 @@ checklog)
;; ;;
info) info)
if [ "$opt_verbose" = true ]; then if [ "$opt_verbose" = true ]; then
list_packages "$@" | xargs rpm -qi list_packages "$@" | xargs -r rpm -qi
else else
list_packages "$@" | xargs rpm -q list_packages "$@" | xargs -r rpm -q
fi fi
;; ;;
info-projects) info-projects)
@ -238,6 +278,9 @@ cpp-glib)
rpmnew) rpmnew)
cmd_rpmnew "$@" cmd_rpmnew "$@"
;; ;;
compile-templates)
cmd_compile_templates "$@"
;;
diff) diff)
cmd_diff "$@" cmd_diff "$@"
;; ;;
@ -255,5 +298,3 @@ help)
;; ;;
esac esac