nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-03-13 08:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Loop Over AWL Directory Candidates

Using this method we're able to loop over the candidate directories
until we find what should be suitable AWL location. Further, adding
additional locations is as simple as adding a new line to ${awldirs}.

It does have the limitation that if the path has a new line in it
(/some/ridic
ulous/path), it'll treat it as two different paths. However, if
somebody seriously has that, they deserve the pain.

See merge request !10
This commit is contained in:
Florian 2014-12-15 22:07:08 +00:00
commit 508837ed21
2 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dba/create-database.sh
View File

@ -10,22 +10,29 @@ DBADIR="`dirname \"$0\"`"
INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXXXX`"
testawldir() {
[ -f "${1}/dba/awl-tables.sql" ]
}
#
# Attempt to locate the AWL directory
AWLDIR="${DBADIR}/../../awl"
if ! testawldir "${AWLDIR}"; then
AWLDIR="/usr/share/awl"
if ! testawldir "${AWLDIR}"; then
AWLDIR="/usr/local/share/awl"
if ! testawldir "${AWLDIR}"; then
echo "Unable to find AWL libraries"
exit 1
# Candidate locations of the AWL directory
awldirs="${DBADIR}/../../awl
/usr/share/awl
/usr/share/php/awl
/usr/local/share/awl"
# Disable globbing and use newline as seperator
set -f; IFS='
'
for d in $awldirs ; do
if [ -f "${d}/dba/awl-tables.sql" ] ; then
AWLDIR="${d}"
break
fi
fi
done
# Renable file globbing and reset seperator
set +f; unset IFS
if [ -z "${AWLDIR}" ] ; then
echo "Unable to find AWL libraries"
exit 1
fi
export AWL_DBAUSER=davical_dba

31
scripts/po/rebuild-translations.sh
View File

@ -10,17 +10,30 @@
PODIR="po"
LOCALEDIR="locale"
APPLICATION="davical"
AWL_LOCATION="../awl"
if [ ! -d "${AWL_LOCATION}" ]; then
AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
if [ ! -d "${AWL_LOCATION}" ]; then
AWL_LOCATION=/usr/share/awl
if [ ! -d "${AWL_LOCATION}" ]; then
echo "I can't find a location for the AWL libraries and I need those strings too"
exit 1
awldirs="../awl
`find .. -type d -name 'awl-*.*'`
/usr/share/awl
/usr/share/php/awl
/usr/local/share/awl"
# Disable globbing and use newline as seperator
set -f; IFS='
'
for d in $awldirs ; do
if [ -d "${d}" ] ; then
AWL_LOCATION="${d}"
break
fi
fi
done
# Renable file globbing and reset seperator
set +f; unset IFS
if [ -z "${AWL_LOCATION}" ] ; then
echo "I can't find a location for the AWL libraries and I need those strings too"
exit 1
fi
egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1