Fix: Minor fix in install tools

This commit is contained in:
Laurent Destailleur 2008-12-28 05:22:00 +00:00
parent 341dcd9aa2
commit 2314b70b6a
2 changed files with 41 additions and 4 deletions

View File

@ -10,7 +10,16 @@
#------------------------------------------------------
export mydir=`echo "$_" | sed -e 's/initdemo.sh//'`;
export id=`id -u`;
# ----------------------------- check if root
if [ "x$id" != "x0" ]
then
echo "Script must be ran as root"
exit
fi
# ----------------------------- database name
DIALOG=${DIALOG=dialog}
DIALOG="$DIALOG --ascii-lines"
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
@ -26,12 +35,31 @@ exit;;
255)
exit;;
esac
# ---------------------------- database port
DIALOG=${DIALOG=dialog}
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Init Dolibarr with demo values" --clear \
--inputbox "Mysql port (ex: 3306):" 16 51 3306 2> $fichtemp
valret=$?
case $valret in
0)
port=`cat $fichtemp`;;
1)
exit;;
255)
exit;;
esac
# ---------------------------- compte admin mysql
DIALOG=${DIALOG=dialog}
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Init Dolibarr with demo values" --clear \
--inputbox "Mysql user login (ex: root):" 16 51 2> $fichtemp
--inputbox "Mysql root login (ex: root):" 16 51 root 2> $fichtemp
valret=$?
@ -43,12 +71,13 @@ exit;;
255)
exit;;
esac
# ---------------------------- mot de passe admin mysql
DIALOG=${DIALOG=dialog}
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Init Dolibarr with demo values" --clear \
--inputbox "Password for Mysql user login :" 16 51 2> $fichtemp
--inputbox "Password for Mysql root login :" 16 51 2> $fichtemp
valret=$?
@ -60,6 +89,7 @@ exit;;
255)
exit;;
esac
# ---------------------------- chemin d'accès du répertoire documents
DIALOG=${DIALOG=dialog}
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
@ -77,10 +107,11 @@ exit;;
255)
exit;;
esac
# ---------------------------- confirmation
DIALOG=${DIALOG=dialog}
$DIALOG --title "Init Dolibarr with demo values" --clear \
--yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql login: '$admin' \n Mysql password : '$passwd' \n Documents dir : '$docs'" 15 40
--yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd' \n Documents dir : '$docs'" 15 40
case $? in
0) echo "Ok, start process...";;
@ -89,7 +120,12 @@ case $? in
esac
# ---------------------------- run sql file
mysql -u$admin -p$passwd $base < $mydir/initdemo.sql
if [ "x$passwd" != "x" ]
then
export passwd="-p$passwd"
fi
echo "mysql -u$admin $passwd $base < $mydir/initdemo.sql"
mysql -u$admin $passwd $base < $mydir/initdemo.sql
echo "Dolibarr data demo has been loaded."
echo

View File

@ -29,6 +29,7 @@ esac
# ---------------------------- remove conf file
echo "Remove file $mydir../../htdocs/conf/conf.php"
cp -pf $mydir../../htdocs/conf/conf.php $mydir../../htdocs/conf/conf.sav.php 2>/dev/null
rm $mydir../../htdocs/conf/conf.php 2>/dev/null
echo "Remove file $mydir../../install.lock"
rm $mydir../../install.lock 2>/dev/null