From 17b1b176980f59e7d9fafb5e51514defcf34493c Mon Sep 17 00:00:00 2001 From: Temur Vibliani Date: Mon, 21 Sep 2015 18:46:05 +0400 Subject: [PATCH] escape internal variables of the script --- V9/odoo_install.sh | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh index b694912..c0e1e8b 100644 --- a/V9/odoo_install.sh +++ b/V9/odoo_install.sh @@ -150,50 +150,50 @@ DESC=$OE_CONFIG USER=$OE_USER # Specify an alternate config file (Default: /etc/openerp-server.conf). -CONFIGFILE="/etc/$OE_CONFIG.conf" +CONFIGFILE="/etc/${OE_CONFIG}.conf" # pidfile -PIDFILE=/var/run/$NAME.pid +PIDFILE=/var/run/\${NAME}.pid # Additional options that are passed to the Daemon. -DAEMON_OPTS="-c $CONFIGFILE" -[ -x $DAEMON ] || exit 0 -[ -f $CONFIGFILE ] || exit 0 +DAEMON_OPTS="-c \$CONFIGFILE" +[ -x \$DAEMON ] || exit 0 +[ -f \$CONFIGFILE ] || exit 0 checkpid() { -[ -f $PIDFILE ] || return 1 -pid=`cat $PIDFILE` -[ -d /proc/$pid ] && return 0 +[ -f \$PIDFILE ] || return 1 +pid=`cat \$PIDFILE` +[ -d /proc/\$pid ] && return 0 return 1 } -case "${1}" in +case "\${1}" in start) -echo -n "Starting ${DESC}: " -start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ ---chuid ${USER} --background --make-pidfile \ ---exec ${DAEMON} -- ${DAEMON_OPTS} -echo "${NAME}." +echo -n "Starting \${DESC}: " +start-stop-daemon --start --quiet --pidfile \${PIDFILE} \ +--chuid \${USER} --background --make-pidfile \ +--exec \${DAEMON} -- \${DAEMON_OPTS} +echo "\${NAME}." ;; stop) -echo -n "Stopping ${DESC}: " -start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \ +echo -n "Stopping \${DESC}: " +start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \ --oknodo -echo "${NAME}." +echo "\${NAME}." ;; restart|force-reload) -echo -n "Restarting ${DESC}: " -start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \ +echo -n "Restarting \${DESC}: " +start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \ --oknodo sleep 1 -start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ ---chuid ${USER} --background --make-pidfile \ ---exec ${DAEMON} -- ${DAEMON_OPTS} -echo "${NAME}." +start-stop-daemon --start --quiet --pidfile \${PIDFILE} \ +--chuid \${USER} --background --make-pidfile \ +--exec \${DAEMON} -- \${DAEMON_OPTS} +echo "\${NAME}." ;; *) -N=/etc/init.d/${NAME} -echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2 +N=/etc/init.d/\${NAME} +echo "Usage: \${NAME} {start|stop|restart|force-reload}" >&2 exit 1 ;;