bweb: add send_one_cmd that uses Open2 instead of Expect

[bacula/bacula] / gui / bweb / install_bweb

diff --git a/gui/bweb/install_bweb b/gui/bweb/install_bweb
index 02fd82eabbc194529932447229ea442075e8b837..ec4fbdfb18c3280aa129b69f8c9e8bbc16ebeba1 100755 (executable)
--- a/gui/bweb/install_bweb
+++ b/gui/bweb/install_bweb
@@ -91,6 +91,7 @@ cat > ${CONF_DIR}/bweb.conf <<END_OF_DATA
    },
   'password' => '${DB_PW}',
   'template_dir' => '${SHARE_DIR}/bweb/tpl',
+  'lang' => 'en',
   'dbi' => 'DBI:mysql:database=bacula',
   'error' => '',
   'debug' => 0,
@@ -103,14 +104,16 @@ fi
 chown ${HTTP_USER} ${CONF_DIR}/bweb.conf
 
 # copy the bweb template file
-if [ ! -d ${SHARE_DIR}/bweb/tpl ] ; then
-   mkdir -p ${SHARE_DIR}/bweb/tpl
+if [ ! -d ${SHARE_DIR}/bweb/tpl/en ] ; then
+   mkdir -p ${SHARE_DIR}/bweb/tpl/{en,fr,es}
 fi
-install -m 644 -o root -g root  tpl/*.tpl ${SHARE_DIR}/bweb/tpl
+install -m 644 -o root -g root  lang/en/tpl/*.tpl ${SHARE_DIR}/bweb/tpl/en
+install -m 644 -o root -g root  lang/es/tpl/*.tpl ${SHARE_DIR}/bweb/tpl/es
+install -m 644 -o root -g root  lang/fr/tpl/*.tpl ${SHARE_DIR}/bweb/tpl/fr
 
 # copy the bweb graphics elements (bweb elements must reside in /bweb)
-if [ ! -d ${WEB_DIR} ] ; then
-   mkdir ${WEB_DIR}/bweb
+if [ ! -d ${WEB_DIR}/bweb ] ; then
+   mkdir -p ${WEB_DIR}/bweb
 fi
 install -m 644 -o root -g root  html/*.{js,png,css,gif,ico,html} ${WEB_DIR}/bweb
 
@@ -125,7 +128,7 @@ echo "  something like :"
 echo "   root# mysql bacula < script/bweb-mysql.sql"
 echo "  or"
 echo "   postgres# echo 'CREATE PROCEDURAL LANGUAGE plpgsql;' | psql bacula"
-echo "   postgres# psql -U bacula -P passwd < script/bweb/bweb-postgresql.sql"
+echo "   postgres# psql -U bacula bacula < script/bweb/bweb-postgresql.sql"
 echo " "
 
 # done !