[osm-tile-server] 01/01: Consistent spacings and other minor tweaks.
Jochen Topf
joto-guest at moszumanska.debian.org
Tue Nov 10 09:22:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
joto-guest pushed a commit to branch master
in repository osm-tile-server.
commit 1101d6f6c6d009f5b534df56f9927f30946c5cc4
Author: Jochen Topf <jochen at topf.org>
Date: Tue Nov 10 10:22:09 2015 +0100
Consistent spacings and other minor tweaks.
---
debian/man/genmanpages.sh | 11 +++++------
debian/osm-tile-server-base.config | 2 +-
debian/osm-tile-server-base.postinst | 4 ++--
scripts/osm-tile-server-download | 3 +--
scripts/osm-tile-server-import | 6 +++---
scripts/osm-tile-server-process | 2 +-
scripts/osm-tile-server-status | 10 +++++++---
7 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/debian/man/genmanpages.sh b/debian/man/genmanpages.sh
index 1204194..def6ab0 100755
--- a/debian/man/genmanpages.sh
+++ b/debian/man/genmanpages.sh
@@ -1,8 +1,7 @@
#!/bin/bash
-
-txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER.CONF -s 5 osm-tile-server.conf.txt > osm-tile-server.conf.5
-txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-PROCESS -s 1 osm-tile-server-process.txt > osm-tile-server-process.1
-txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-IMPORT -s 1 osm-tile-server-import.txt > osm-tile-server-import.1
-txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-TILELITE -s 7 osm-tile-server-tilelite.txt > osm-tile-server-tilelite.7
-txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER -s 7 osm-tile-server.txt > osm-tile-server.7
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER.CONF -s 5 osm-tile-server.conf.txt > osm-tile-server.conf.5
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-PROCESS -s 1 osm-tile-server-process.txt > osm-tile-server-process.1
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-IMPORT -s 1 osm-tile-server-import.txt > osm-tile-server-import.1
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER-TILELITE -s 7 osm-tile-server-tilelite.txt > osm-tile-server-tilelite.7
+txt2man -d "${CHANGELOG_DATE}" -t OSM-TILE-SERVER -s 7 osm-tile-server.txt > osm-tile-server.7
diff --git a/debian/osm-tile-server-base.config b/debian/osm-tile-server-base.config
index e244868..62624de 100644
--- a/debian/osm-tile-server-base.config
+++ b/debian/osm-tile-server-base.config
@@ -10,7 +10,7 @@ CONFIGTYPEQUESTION=2
BACKSTATE=4
. /etc/osm-tile-server.conf
-if [ ! "$DBNAME" = "" ] ;then
+if [ ! "$DBNAME" = "" ] ; then
db_set osm-tile-server/db-name $DBNAME
fi
diff --git a/debian/osm-tile-server-base.postinst b/debian/osm-tile-server-base.postinst
index b3a6f83..4416a54 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -37,11 +37,11 @@ case "$1" in
PROCESSNOW=$RET
db_set osm-tile-server/do_it_now "Later"
- if ! getent group $DBUSER >/dev/null; then
+ if ! getent group $DBUSER >/dev/null ; then
addgroup --system $DBUSER >/dev/null
fi
- if ! getent passwd $DBUSER >/dev/null; then
+ if ! getent passwd $DBUSER >/dev/null ; then
adduser \
--system \
--disabled-login \
diff --git a/scripts/osm-tile-server-download b/scripts/osm-tile-server-download
index 564052b..eae1af4 100755
--- a/scripts/osm-tile-server-download
+++ b/scripts/osm-tile-server-download
@@ -8,9 +8,8 @@ REGION=`cat /var/lib/osm-tile-server-base/selected_region.txt`
FILENAME="downloaded.osm.pbf"
URL="${SRC_URL}/${REGION}-latest.osm.pbf"
COMMAND="wget -O /var/cache/osm-tile-server-base/${FILENAME} ${URL}"
-echo "The following command will be run to download:\n\n"
+echo "The following command will now be run to download:\n\n"
echo " ${COMMAND}\n\n"
$COMMAND
-
diff --git a/scripts/osm-tile-server-import b/scripts/osm-tile-server-import
index 74cb1e6..4c099a8 100755
--- a/scripts/osm-tile-server-import
+++ b/scripts/osm-tile-server-import
@@ -19,9 +19,9 @@ if groups | grep -q '\bosm-tile-server\b' ; then
ALLOWED=1
fi
-if [ $ALLOWED = 1 ] ;then
- /usr/lib/osm-tile-server-base/bin/osm-tile-server-import-raw "$1"
+if [ $ALLOWED = 1 ] ; then
+ /usr/lib/osm-tile-server-base/bin/osm-tile-server-import-raw "$1"
else
- no_permission
+ no_permission
fi
diff --git a/scripts/osm-tile-server-process b/scripts/osm-tile-server-process
index b8598f8..492221a 100755
--- a/scripts/osm-tile-server-process
+++ b/scripts/osm-tile-server-process
@@ -20,7 +20,7 @@ if groups | grep -q '\bosm-tile-server\b' ; then
ALLOWED=1
fi
-if [ $ALLOWED = 0 ] ;then
+if [ $ALLOWED = 0 ] ; then
no_permission
exit -1
fi
diff --git a/scripts/osm-tile-server-status b/scripts/osm-tile-server-status
index 8e70bbc..4f79f34 100755
--- a/scripts/osm-tile-server-status
+++ b/scripts/osm-tile-server-status
@@ -2,11 +2,15 @@
umask 002
+STATUS_FILE=/var/lib/osm-tile-server-base/status.txt
+
if [ "$1" = "done" ] ; then
- echo "DONE" > /var/lib/osm-tile-server-base/status.txt
+ echo "DONE" > $STATUS_FILE
elif [ "$1" = "inprogress" ] ; then
- echo "INPROGRESS" > /var/lib/osm-tile-server-base/status.txt
+ echo "INPROGRESS" > $STATUS_FILE
elif [ "$1" = "todo" ] ; then
- echo "TODO" > /var/lib/osm-tile-server-base/status.txt
+ echo "TODO" > $STATUS_FILE
+else
+ exit 1
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git
More information about the Pkg-grass-devel
mailing list