DeforaOS/Auditor
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import the latest version of the scripts upstream

Browse Source
This commit is contained in:
Pierre Pronchery 2020-01-31 00:16:35 +01:00
parent 62953cb71d
commit e7867ddd8b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/docbook.sh
View File

@ -170,7 +170,7 @@ while [ $# -gt 0 ]; do
xpath="string(/refentry/refmeta/manvolnum)" xpath="string(/refentry/refmeta/manvolnum)"
section=$($XMLLINT --xpath "$xpath" "$source") section=$($XMLLINT --xpath "$xpath" "$source")
if [ $? -eq 0 -a -n "$section" ]; then if [ $? -eq 0 -a -n "$section" ]; then
instdir="$DATADIR/man/html$section" instdir="$MANDIR/html$section"
fi fi
;; ;;
pdf) pdf)

6
tools/subst.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2017 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-2019 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -36,7 +36,6 @@ LIBEXECDIR=
MANDIR= MANDIR=
PROGNAME="subst.sh" PROGNAME="subst.sh"
SYSCONFDIR= SYSCONFDIR=
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#executables #executables
CHMOD="chmod" CHMOD="chmod"
DATE="date" DATE="date"
@ -46,6 +45,7 @@ INSTALL="install"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
SED="sed" SED="sed"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
@ -125,8 +125,8 @@ _subst()
-e "s;@LIBDIR@;$LIBDIR;g" \ -e "s;@LIBDIR@;$LIBDIR;g" \
-e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \ -e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \
-e "s;@MANDIR@;$MANDIR;g" \ -e "s;@MANDIR@;$MANDIR;g" \
-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
-e "s;@PWD@;$PWD;g" \ -e "s;@PWD@;$PWD;g" \
-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
-- "$source" > "$target" -- "$source" > "$target"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$RM -- "$target" 2> "$DEVNULL" $RM -- "$target" 2> "$DEVNULL"