Skip to content

Commit 97563a6

Browse files
author
Temur Vibliani
committed
[IMP] Readability fix
 - Replaced ECHO sequence with a CAT command. On branch v9_enhance_script_readability Changes to be committed: modified: V9/odoo_install.sh
1 parent f248b38 commit 97563a6

File tree

1 file changed

+72
-70
lines changed

1 file changed

+72
-70
lines changed

‎V9/odoo_install.sh‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -128,76 +128,78 @@ sudo chmod 755 $OE_HOME_EXT/start.sh
128128
#--------------------------------------------------
129129

130130
echo -e "* Create init file"
131-
echo '#!/bin/sh' >> ~/$OE_CONFIG
132-
echo '### BEGIN INIT INFO' >> ~/$OE_CONFIG
133-
echo '# Provides: $OE_CONFIG' >> ~/$OE_CONFIG
134-
echo '# Required-Start: $remote_fs $syslog' >> ~/$OE_CONFIG
135-
echo '# Required-Stop: $remote_fs $syslog' >> ~/$OE_CONFIG
136-
echo '# Should-Start: $network' >> ~/$OE_CONFIG
137-
echo '# Should-Stop: $network' >> ~/$OE_CONFIG
138-
echo '# Default-Start: 2 3 4 5' >> ~/$OE_CONFIG
139-
echo '# Default-Stop: 0 1 6' >> ~/$OE_CONFIG
140-
echo '# Short-Description: Enterprise Business Applications' >> ~/$OE_CONFIG
141-
echo '# Description: ODOO Business Applications' >> ~/$OE_CONFIG
142-
echo '### END INIT INFO' >> ~/$OE_CONFIG
143-
echo 'PATH=/bin:/sbin:/usr/bin' >> ~/$OE_CONFIG
144-
echo "DAEMON=$OE_HOME_EXT/openerp-server" >> ~/$OE_CONFIG
145-
echo "NAME=$OE_CONFIG" >> ~/$OE_CONFIG
146-
echo "DESC=$OE_CONFIG" >> ~/$OE_CONFIG
147-
echo '' >> ~/$OE_CONFIG
148-
echo '# Specify the user name (Default: odoo).' >> ~/$OE_CONFIG
149-
echo "USER=$OE_USER" >> ~/$OE_CONFIG
150-
echo '' >> ~/$OE_CONFIG
151-
echo '# Specify an alternate config file (Default: /etc/openerp-server.conf).' >> ~/$OE_CONFIG
152-
echo "CONFIGFILE=\"/etc/$OE_CONFIG.conf\"" >> ~/$OE_CONFIG
153-
echo '' >> ~/$OE_CONFIG
154-
echo '# pidfile' >> ~/$OE_CONFIG
155-
echo 'PIDFILE=/var/run/$NAME.pid' >> ~/$OE_CONFIG
156-
echo '' >> ~/$OE_CONFIG
157-
echo '# Additional options that are passed to the Daemon.' >> ~/$OE_CONFIG
158-
echo 'DAEMON_OPTS="-c $CONFIGFILE"' >> ~/$OE_CONFIG
159-
echo '[ -x $DAEMON ] || exit 0' >> ~/$OE_CONFIG
160-
echo '[ -f $CONFIGFILE ] || exit 0' >> ~/$OE_CONFIG
161-
echo 'checkpid() {' >> ~/$OE_CONFIG
162-
echo '[ -f $PIDFILE ] || return 1' >> ~/$OE_CONFIG
163-
echo 'pid=`cat $PIDFILE`' >> ~/$OE_CONFIG
164-
echo '[ -d /proc/$pid ] && return 0' >> ~/$OE_CONFIG
165-
echo 'return 1' >> ~/$OE_CONFIG
166-
echo '}' >> ~/$OE_CONFIG
167-
echo '' >> ~/$OE_CONFIG
168-
echo 'case "${1}" in' >> ~/$OE_CONFIG
169-
echo 'start)' >> ~/$OE_CONFIG
170-
echo 'echo -n "Starting ${DESC}: "' >> ~/$OE_CONFIG
171-
echo 'start-stop-daemon --start --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
172-
echo '--chuid ${USER} --background --make-pidfile \' >> ~/$OE_CONFIG
173-
echo '--exec ${DAEMON} -- ${DAEMON_OPTS}' >> ~/$OE_CONFIG
174-
echo 'echo "${NAME}."' >> ~/$OE_CONFIG
175-
echo ';;' >> ~/$OE_CONFIG
176-
echo 'stop)' >> ~/$OE_CONFIG
177-
echo 'echo -n "Stopping ${DESC}: "' >> ~/$OE_CONFIG
178-
echo 'start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
179-
echo '--oknodo' >> ~/$OE_CONFIG
180-
echo 'echo "${NAME}."' >> ~/$OE_CONFIG
181-
echo ';;' >> ~/$OE_CONFIG
182-
echo '' >> ~/$OE_CONFIG
183-
echo 'restart|force-reload)' >> ~/$OE_CONFIG
184-
echo 'echo -n "Restarting ${DESC}: "' >> ~/$OE_CONFIG
185-
echo 'start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
186-
echo '--oknodo' >> ~/$OE_CONFIG
187-
echo 'sleep 1' >> ~/$OE_CONFIG
188-
echo 'start-stop-daemon --start --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
189-
echo '--chuid ${USER} --background --make-pidfile \' >> ~/$OE_CONFIG
190-
echo '--exec ${DAEMON} -- ${DAEMON_OPTS}' >> ~/$OE_CONFIG
191-
echo 'echo "${NAME}."' >> ~/$OE_CONFIG
192-
echo ';;' >> ~/$OE_CONFIG
193-
echo '*)' >> ~/$OE_CONFIG
194-
echo 'N=/etc/init.d/${NAME}' >> ~/$OE_CONFIG
195-
echo 'echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2' >> ~/$OE_CONFIG
196-
echo 'exit 1' >> ~/$OE_CONFIG
197-
echo ';;' >> ~/$OE_CONFIG
198-
echo '' >> ~/$OE_CONFIG
199-
echo 'esac' >> ~/$OE_CONFIG
200-
echo 'exit 0' >> ~/$OE_CONFIG
131+
cat <<EOF > ~/$OE_CONFIG
132+
#!/bin/sh
133+
### BEGIN INIT INFO
134+
# Provides: $OE_CONFIG
135+
# Required-Start: $remote_fs $syslog
136+
# Required-Stop: $remote_fs $syslog
137+
# Should-Start: $network
138+
# Should-Stop: $network
139+
# Default-Start: 2 3 4 5
140+
# Default-Stop: 0 1 6
141+
# Short-Description: Enterprise Business Applications
142+
# Description: ODOO Business Applications
143+
### END INIT INFO
144+
PATH=/bin:/sbin:/usr/bin
145+
DAEMON=$OE_HOME_EXT/openerp-server
146+
NAME=$OE_CONFIG
147+
DESC=$OE_CONFIG
148+
149+
# Specify the user name (Default: odoo).
150+
USER=$OE_USER
151+
152+
# Specify an alternate config file (Default: /etc/openerp-server.conf).
153+
CONFIGFILE="/etc/$OE_CONFIG.conf"
154+
155+
# pidfile
156+
PIDFILE=/var/run/$NAME.pid
157+
158+
# Additional options that are passed to the Daemon.
159+
DAEMON_OPTS="-c $CONFIGFILE"
160+
[ -x $DAEMON ] || exit 0
161+
[ -f $CONFIGFILE ] || exit 0
162+
checkpid() {
163+
[ -f $PIDFILE ] || return 1
164+
pid=`cat $PIDFILE`
165+
[ -d /proc/$pid ] && return 0
166+
return 1
167+
}
168+
169+
case "${1}" in
170+
start)
171+
echo -n "Starting ${DESC}: "
172+
start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
173+
--chuid ${USER} --background --make-pidfile \
174+
--exec ${DAEMON} -- ${DAEMON_OPTS}
175+
echo "${NAME}."
176+
;;
177+
stop)
178+
echo -n "Stopping ${DESC}: "
179+
start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
180+
--oknodo
181+
echo "${NAME}."
182+
;;
183+
184+
restart|force-reload)
185+
echo -n "Restarting ${DESC}: "
186+
start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
187+
--oknodo
188+
sleep 1
189+
start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
190+
--chuid ${USER} --background --make-pidfile \
191+
--exec ${DAEMON} -- ${DAEMON_OPTS}
192+
echo "${NAME}."
193+
;;
194+
*)
195+
N=/etc/init.d/${NAME}
196+
echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
197+
exit 1
198+
;;
199+
200+
esac
201+
exit 0
202+
EOF
201203

202204
echo -e "* Security Init File"
203205
sudo mv ~/$OE_CONFIG /etc/init.d/$OE_CONFIG

0 commit comments

Comments
 (0)