Fix: Code could not works for debian packages
This commit is contained in:
Laurent Destailleur
parent
42fa44e596
commit
6f7e38d55e
@ -14,6 +14,3 @@ version-phpsane.txt
|
||||
makepack-phpsane.conf
|
||||
html
|
||||
*.deb
|
||||
*.dsc
|
||||
*.tar.gz
|
||||
*.changes
|
||||
|
||||
@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
|
||||
- Call for a mentor on ML debian-mentors to upload packages
|
||||
|
||||
- Once package is uploaded, following URL are available:
|
||||
http://packages.qa.debian.org/package.html
|
||||
http://packages.qa.debian.org/package
|
||||
http://bugs.debian.org/package
|
||||
|
||||
@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
|
||||
* New upstream release.
|
||||
closes: bug#634783
|
||||
|
||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
|
||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 18 Jul 2011 12:00:00 +0100
|
||||
|
||||
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.
|
||||
# More information into /usr/share/dolibarr/ChangeLog file.
|
||||
@ -1,48 +0,0 @@
|
||||
Package: dolibarr
|
||||
Version: __VERSION__
|
||||
Architecture: all
|
||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
Installed-Size: 61200
|
||||
Depends: debconf, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
||||
Section: web
|
||||
Priority: optional
|
||||
Recommends: firefox
|
||||
Homepage: http://www.dolibarr.org
|
||||
Description: Easy to use web based ERP & CRM software
|
||||
Dolibarr ERP & CRM is an easy to use open source/free software for small
|
||||
and medium companies, foundations or freelances. It includes different
|
||||
features for Enterprise Resource Planning (ERP) and Customer Relationship
|
||||
Management (CRM) but also for different other activities.
|
||||
It's a web software you can install as a standalone program or on any web
|
||||
hosting provider to use it from anywhere with any web browser.
|
||||
Dolibarr was designed to provide only features you need and be easy to use.
|
||||
.
|
||||
Only features you need are visible, depending on which module were activated.
|
||||
Most common used modules are:
|
||||
.
|
||||
Customers, Suppliers or Prospects directory
|
||||
Contacts directory
|
||||
Orders management
|
||||
Commercial proposals management
|
||||
Invoices management
|
||||
Products and services catalog
|
||||
Stock management
|
||||
Foundations members management
|
||||
Bank accounts management
|
||||
Point of Sale
|
||||
Payments management
|
||||
Commercial actions management
|
||||
Contracts management
|
||||
Standing orders management
|
||||
Shipping management
|
||||
Donations management
|
||||
Bookmarks management
|
||||
Mass Emailings
|
||||
Reports
|
||||
Data export and import tools
|
||||
LDAP connectivity
|
||||
PDF exports
|
||||
And a lot of more modules...
|
||||
.
|
||||
You can also add third parties external modules or develop yours.
|
||||
|
||||
@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
|
||||
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
|
||||
# Command to open an URL
|
||||
# For Fedora: xdg-open
|
||||
# For Debian/Ubuntu: x-www-browser
|
||||
# For Debian/Ubuntu: xdg-open or x-www-browser
|
||||
# (exo-open for xfde, gnome-open for gnome, ...)
|
||||
Exec=x-www-browser http://localhost/dolibarr
|
||||
Exec=xdg-open http://localhost/dolibarr
|
||||
Icon=dolibarr
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
@ -4,19 +4,19 @@
|
||||
// This file must be present into htdocs/install directory
|
||||
// during install process to be used.
|
||||
//
|
||||
// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
|
||||
// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
|
||||
//
|
||||
|
||||
$force_install_noedit=2;
|
||||
$force_install_noedit=1;
|
||||
$force_install_message='KeepDefaultValuesDeb';
|
||||
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
||||
$force_install_type='mysqli';
|
||||
$force_install_dbserver='localhost';
|
||||
$force_install_port='3306';
|
||||
$force_install_database='dolibarrdebian';
|
||||
$force_install_database='dolibarr';
|
||||
$force_install_createdatabase='1';
|
||||
$force_install_databaselogin='dolibarrdebian';
|
||||
$force_install_databaselogin='dolibarrmysql';
|
||||
$force_install_databasepass='';
|
||||
$force_install_createuser='1';
|
||||
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
||||
|
||||
@ -24,31 +24,23 @@ db_version 2.0
|
||||
echo Run the dolibarr postinst script
|
||||
|
||||
|
||||
# Define vars
|
||||
docdir='/var/lib/dolibarr/documents'
|
||||
#docdir='/usr/share/dolibarr/documents'
|
||||
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
apacheconfig="/etc/dolibarr/apache.conf"
|
||||
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||
installconfig="/etc/dolibarr/install.forced.php"
|
||||
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
|
||||
config="/etc/dolibarr/conf.php"
|
||||
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
|
||||
# Create document directory for uploaded data files
|
||||
mkdir -p $docdir
|
||||
chown -R www-data:www-data $docdir
|
||||
chmod -R 775 $docdir
|
||||
chmod -R g+s $docdir
|
||||
|
||||
# Copy apache.conf file into target directory
|
||||
# Copy apache.conf file into target directory.
|
||||
#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
#config="/etc/dolibarr/apache.conf"
|
||||
#mkdir -p /etc/dolibarr
|
||||
#cp -p $apachefileorig $apacheconfig
|
||||
#cp -p $fileorig $config
|
||||
|
||||
# Copy install config file (with matching Debian) values into target directory
|
||||
# Edit install.forced.php to match Debian values
|
||||
fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||
config="/usr/share/dolibarr/htdocs/install/install.forced.php"
|
||||
superuserlogin=''
|
||||
superuserpassword=''
|
||||
if [ -f /etc/mysql/debian.cnf ] ; then
|
||||
@ -58,24 +50,29 @@ case "$1" in
|
||||
fi
|
||||
echo Mysql superuser found to use is $superuserlogin
|
||||
if [ -z "$superuserlogin" ] ; then
|
||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
|
||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
|
||||
else
|
||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
|
||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
|
||||
fi
|
||||
chown -R root:www-data $installconfig
|
||||
chmod -R 660 $installconfig
|
||||
|
||||
# Create document directory for uploaded data files
|
||||
mkdir -p $docdir
|
||||
chown -R www-data:www-data $docdir
|
||||
chmod -R 775 $docdir
|
||||
chmod -R g+s $docdir
|
||||
|
||||
# Create an empty conf.php with permission to web server
|
||||
if [ ! -f $config ]
|
||||
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
|
||||
then
|
||||
echo Create empty file $config
|
||||
touch $config
|
||||
chown -R root:www-data $config
|
||||
chmod -R 660 $config
|
||||
echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
touch /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
fi
|
||||
|
||||
# Get the web server type (use db_get for interactive mode).
|
||||
#db_reset "dolibarr/webserver"
|
||||
|
||||
# Get the web server type (use db_get for interactive mode).
|
||||
#db_get "dolibarr/webserver" # Read value for webserver.
|
||||
#webserver="$RET"
|
||||
|
||||
@ -105,7 +102,7 @@ case "$1" in
|
||||
|
||||
# Set permissions to web server
|
||||
chown -R $webuser:$webgroup /usr/share/dolibarr
|
||||
chown -R root:$webgroup $config
|
||||
chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
|
||||
# Add link to config file
|
||||
echo Setup web server $server to add dolibarr config file
|
||||
@ -113,6 +110,26 @@ case "$1" in
|
||||
|
||||
done
|
||||
|
||||
#echo "Install menu entry"
|
||||
# This one is for Gnome ubuntu
|
||||
#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
|
||||
#target="/usr/share/applications/"
|
||||
#cp -f $fileorig $target
|
||||
# Not sure this is usefull
|
||||
#if test -x /usr/bin/update-menus; then
|
||||
# echo "update-menus"
|
||||
# update-menus;
|
||||
#fi
|
||||
|
||||
# TODO Create the file to force parameters in Web installer
|
||||
#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
|
||||
#then
|
||||
# perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
#fi
|
||||
|
||||
# Restart servers
|
||||
servers="apache2-ssl apache2 mysql"
|
||||
# Another way to restart
|
||||
|
||||
113
build/deb/postrm
113
build/deb/postrm
@ -26,11 +26,6 @@ echo Run the dolibarr postrm script
|
||||
|
||||
docdir='/var/lib/dolibarr/documents'
|
||||
#docdir='/usr/share/dolibarr/documents'
|
||||
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
apacheconfig="/etc/dolibarr/apache.conf"
|
||||
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
|
||||
config="/etc/dolibarr/conf.php"
|
||||
lockfile="/usr/share/dolibarr/install.lock"
|
||||
|
||||
|
||||
export webserver=""
|
||||
@ -41,38 +36,13 @@ case $webserver in
|
||||
Both) webservers="apache2 apache2-ssl" ;;
|
||||
*) webservers="apache2 apache2-ssl" ;;
|
||||
esac
|
||||
export includefile=/etc/dolibarr/apache.conf
|
||||
|
||||
|
||||
case "$1" in
|
||||
|
||||
# Call when we upgrade
|
||||
upgrade)
|
||||
;;
|
||||
|
||||
# Call when we uninstall
|
||||
remove)
|
||||
rm -f $lockfile
|
||||
|
||||
# Remove include files
|
||||
export restart=""
|
||||
for server in $webservers ; do
|
||||
export conffile="/etc/$server/conf.d/dolibarr.conf"
|
||||
if [ -f $conffile ] ;
|
||||
then
|
||||
echo Delete link $conffile
|
||||
rm -f $conffile
|
||||
status=purge
|
||||
fi
|
||||
|
||||
if [ "x$status" = "xpurge" ] ;
|
||||
then restart="$restart $server"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
|
||||
# Call when we uninstall and purge
|
||||
purge)
|
||||
echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
|
||||
echo "postrm purge webservers=$webservers includefile=$includefile"
|
||||
|
||||
# Ask if we must delete database
|
||||
echo "postrm db_input dolibarr/postrm"
|
||||
@ -89,8 +59,7 @@ case "$1" in
|
||||
echo postrm Mysql database deletion
|
||||
# Get database configuration
|
||||
dbserver="localhost"
|
||||
dbuser="dolibarrdebian"
|
||||
dbname="dolibarrdebian"
|
||||
dbname="dolibarrmysql"
|
||||
#db_get "dolibarr/db/name"
|
||||
#dbname="$RET"
|
||||
superuserlogin=''
|
||||
@ -151,31 +120,23 @@ case "$1" in
|
||||
fi
|
||||
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
||||
|
||||
# Now run the drop user
|
||||
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
|
||||
echo Database login $dbuser removed
|
||||
else
|
||||
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
|
||||
echo $error
|
||||
fi
|
||||
|
||||
# Now run the drop commands
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
log="${log}Droping database $dbname."
|
||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||
echo $error
|
||||
else
|
||||
status=drop
|
||||
fi
|
||||
else
|
||||
error="Unable to run the drop database script."
|
||||
echo $error
|
||||
fi
|
||||
log="${log}Droping database $dbname."
|
||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||
echo $error
|
||||
else
|
||||
status=drop
|
||||
fi
|
||||
else
|
||||
error="Unable to run the drop database script."
|
||||
echo $error
|
||||
fi
|
||||
else
|
||||
status=nothing
|
||||
log="${log}Database $dbname already not exists."
|
||||
status=nothing
|
||||
log="${log}Database $dbname already not exists."
|
||||
fi
|
||||
|
||||
echo "Remove directory $docdir"
|
||||
@ -217,6 +178,18 @@ case "$1" in
|
||||
set -e
|
||||
done
|
||||
|
||||
# Remove file and conf file
|
||||
for dir in /usr/share/dolibarr; do
|
||||
if [ -d $dir ] ; then
|
||||
# We disable blocking errors
|
||||
set +e
|
||||
echo "Remove directory $dir"
|
||||
rm -rf $dir ;
|
||||
# We restore blocking errors
|
||||
set -e
|
||||
fi
|
||||
done
|
||||
|
||||
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
||||
set +e
|
||||
db_reset "dolibarr/postrm"
|
||||
@ -225,6 +198,34 @@ case "$1" in
|
||||
#db_purge
|
||||
;;
|
||||
|
||||
# Call when we uninstall
|
||||
remove)
|
||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
|
||||
rm -fr /usr/share/dolibarr/htdocs/install
|
||||
|
||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
|
||||
rm -fr /usr/share/dolibarr/htdocs/conf
|
||||
|
||||
# Remove include files
|
||||
export restart=""
|
||||
for server in $webservers ; do
|
||||
export conffile="/etc/$server/conf.d/dolibarr.conf"
|
||||
if [ -f $conffile ] ;
|
||||
then
|
||||
echo Delete file $conffile
|
||||
rm -f $conffile
|
||||
status=purge
|
||||
fi
|
||||
|
||||
if [ "x$status" = "xpurge" ] ;
|
||||
then restart="$restart $server"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
;;
|
||||
|
||||
failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Template: dolibarr/postrm
|
||||
Type: boolean
|
||||
Default: true
|
||||
Description: Delete database ?
|
||||
Answer if you want to removed the Dolibarr MySQL database and all
|
||||
its datas (datas related to this quetion are the Dolibarr DBMS account
|
||||
and all Dolibarr tables).
|
||||
_Description: Delete database and uploaded files ?
|
||||
Answer if you want to removed the Dolibarr MySQL database and all other
|
||||
datas (datas related to this question are the Dolibarr DBMS account, all
|
||||
Dolibarr tables, and all uploaded files).
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#----------------------------------------------------------------------------
|
||||
# \file build/makepack-dolibarr.pl
|
||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.122 2011/07/30 10:23:26 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -11,7 +11,7 @@ use Cwd;
|
||||
$PROJECT="dolibarr";
|
||||
$MAJOR="3";
|
||||
$MINOR="1";
|
||||
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$RPMSUBVERSION="auto"; # auto use value found into BUILD
|
||||
|
||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$REVISION='$Revision: 1.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="1.0 (build $REVISION)";
|
||||
|
||||
|
||||
@ -274,10 +274,6 @@ if ($nboftargetok) {
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
|
||||
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
||||
@ -414,19 +410,14 @@ if ($nboftargetok) {
|
||||
}
|
||||
|
||||
if ($target eq 'RPM') { # Linux only
|
||||
#$ARCH='i386';
|
||||
$ARCH='noarch';
|
||||
$ARCH='i386';
|
||||
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
|
||||
$newbuild = $BUILD;
|
||||
# For fedora
|
||||
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
|
||||
$newbuild =~ s/beta/0.2.beta1/gi; # beta
|
||||
$newbuild =~ s/rc./0.3.rc1/gi; # rc
|
||||
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
$newbuild =~ s/beta/1/gi; # beta
|
||||
$newbuild =~ s/rc./2/gi; # rc
|
||||
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
#$newbuild =~ s/beta/1/gi; # beta
|
||||
#$newbuild =~ s/rc./2/gi; # rc
|
||||
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
# now newbuild is 0-0 or 0-3 for example
|
||||
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
|
||||
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
|
||||
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
|
||||
@ -444,7 +435,6 @@ if ($nboftargetok) {
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
|
||||
@ -482,10 +472,6 @@ if ($nboftargetok) {
|
||||
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
|
||||
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
||||
$ret=`$cmd`;
|
||||
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
|
||||
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
@ -536,33 +522,20 @@ if ($nboftargetok) {
|
||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
|
||||
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
|
||||
@ -676,25 +649,29 @@ if ($nboftargetok) {
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||
# Add files for dpkg-source
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
# Add files also required to build binary package with dpkg-buildpackages
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
|
||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||
$ret=`$cmd`;
|
||||
@ -710,18 +687,12 @@ if ($nboftargetok) {
|
||||
if ($OS =~ /windows/i)
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
@ -14,8 +14,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -204,5 +203,5 @@ print "</table>";
|
||||
|
||||
// End of page
|
||||
$db->close();
|
||||
llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $');
|
||||
llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $');
|
||||
?>
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/install/check.php
|
||||
* \ingroup install
|
||||
* \brief Test if file conf can be modified and if does not exists, test if install process can create it
|
||||
* \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
include_once("./inc.php");
|
||||
|
||||
@ -39,9 +39,7 @@ $langs->load("install");
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
|
||||
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("Dolibarr install/upgrade process started");
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* \file htdocs/install/etape0.php
|
||||
* \ingroup install
|
||||
* \brief Show and ask charset for database
|
||||
* \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
|
||||
@ -49,9 +49,7 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:"";
|
||||
$main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):'';
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("--- etape0: Entering etape0.php page");
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
* \file htdocs/install/etape1.php
|
||||
* \ingroup install
|
||||
* \brief Build conf file on disk
|
||||
* \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
|
||||
* \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
|
||||
@ -39,9 +39,7 @@ $langs->load("admin");
|
||||
$langs->load("install");
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("--- etape1: Entering etape1.php page");
|
||||
|
||||
@ -528,7 +526,6 @@ function write_conf_file($conffile)
|
||||
global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
|
||||
global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
|
||||
global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
|
||||
global $conffile,$conffiletoshow,$conffiletoshowshort;
|
||||
|
||||
$error=0;
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* \file htdocs/install/etape2.php
|
||||
* \ingroup install
|
||||
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
|
||||
* \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
include("./inc.php");
|
||||
@ -54,9 +54,7 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
|
||||
if ($dolibarr_main_db_type == "mssql") $choix=3;
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard.
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("--- etape2: Entering etape2.php page");
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/install/etape4.php
|
||||
* \ingroup install
|
||||
* \brief Ask login and password of Dolibarr admin user
|
||||
* \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -41,9 +41,7 @@ $langs->load("install");
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
|
||||
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("--- etape4: Entering etape4.php page");
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
* \file htdocs/install/etape5.php
|
||||
* \ingroup install
|
||||
* \brief Last page of upgrade or install process
|
||||
* \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
|
||||
* \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
include_once("./inc.php");
|
||||
@ -63,9 +63,12 @@ if (! isset($force_install_databasepass)) $force_install_databasepass='';
|
||||
if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
|
||||
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
|
||||
if (! isset($force_install_lockinstall)) $force_install_lockinstall='';
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
$usedoliwamp=false;
|
||||
if (file_exists("./install.forced.php"))
|
||||
{
|
||||
$usedoliwamp=true;
|
||||
include_once("./install.forced.php");
|
||||
}
|
||||
|
||||
dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
|
||||
|
||||
@ -102,7 +105,6 @@ if ($action == "set")
|
||||
*/
|
||||
|
||||
pHeader($langs->trans("SetupEnd"),"etape5");
|
||||
print '<br>';
|
||||
|
||||
// Test if we can run a first install process
|
||||
if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile))
|
||||
@ -206,7 +208,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
|
||||
if (! $resql) dol_print_error($db,'Error in setup program');
|
||||
$conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
|
||||
|
||||
if ($useforcedwizard)
|
||||
if ($usedoliwamp)
|
||||
{
|
||||
dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
|
||||
$resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
|
||||
@ -315,6 +317,7 @@ if ($action == "set")
|
||||
if (! empty($force_install_lockinstall))
|
||||
{
|
||||
// Install is finished, we create the lock file
|
||||
$lockfile="../../install.lock";
|
||||
$fp = @fopen($lockfile, "w");
|
||||
if ($fp)
|
||||
{
|
||||
@ -364,6 +367,7 @@ elseif (preg_match('/upgrade/i',$action))
|
||||
if (! empty($force_install_lockinstall))
|
||||
{
|
||||
// Upgrade is finished, we create the lock file
|
||||
$lockfile="../../install.lock";
|
||||
$fp = @fopen($lockfile, "w");
|
||||
if ($fp)
|
||||
{
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* \file htdocs/install/fileconf.php
|
||||
* \ingroup install
|
||||
* \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
|
||||
* \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
|
||||
* \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
include_once("./inc.php");
|
||||
|
||||
@ -39,8 +39,8 @@ $langs->load("install");
|
||||
$langs->load("errors");
|
||||
|
||||
// You can force preselected values of the config step of Dolibarr by adding a file
|
||||
// install.forced.php into directory htdocs/install (This is the case with some wizard
|
||||
// installer like DoliWamp, DoliMamp or DoliBuntu).
|
||||
// install.forced.php into directory htdocs/install (This is the case with some installer
|
||||
// lile DoliWamp, DoliMamp or DoliBuntu.
|
||||
// We first init "forced values" to nothing.
|
||||
if (! isset($force_install_noedit)) $force_install_noedit='';
|
||||
if (! isset($force_install_type)) $force_install_type='';
|
||||
@ -53,9 +53,7 @@ if (! isset($force_install_databasepass)) $force_install_databasepass='';
|
||||
if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
|
||||
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
|
||||
// Now we load forced value from install.forced.php file.
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
|
||||
|
||||
@ -161,10 +159,7 @@ if (! empty($force_install_message))
|
||||
}
|
||||
?>
|
||||
<td class="label" valign="top">
|
||||
<?php
|
||||
if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_data_root.'" name="main_data_dir">';
|
||||
print '<input type="text" size="60" value="'.$dolibarr_main_data_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_data_dir'.(($force_install_noedit != 2)?'':'_bis').'">';
|
||||
?>
|
||||
<input type="text" size="60" value="<?php print $dolibarr_main_data_root; ?>"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> name="main_data_dir">
|
||||
</td>
|
||||
<td class="comment"><?php
|
||||
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
|
||||
@ -172,7 +167,7 @@ if (! empty($force_install_message))
|
||||
print $langs->trans("Examples").":<br>";
|
||||
?>
|
||||
<ul>
|
||||
<li>/var/lib/dolibarr/documents</li>
|
||||
<li>/var/dolibarr_documents</li>
|
||||
<li>C:/My Documents/dolibarr/</li>
|
||||
</ul>
|
||||
</td>
|
||||
@ -210,10 +205,7 @@ if (empty($dolibarr_main_url_root))
|
||||
<td valign="top" class="label"><b> <?php echo $langs->trans("URLRoot"); ?></b>
|
||||
</td>
|
||||
<td valign="top" class="label">
|
||||
<?php
|
||||
if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_url_root.'" name="main_url">';
|
||||
print '<input type="text" size="60" value="'.$dolibarr_main_url_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_url'.(($force_install_noedit != 2)?'':'_bis').'">';
|
||||
?>
|
||||
<input type="text" size="60" name="main_url"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> value="<?php print $dolibarr_main_url_root; ?>">
|
||||
</td>
|
||||
<td class="comment"><?php print $langs->trans("Examples").":<br>"; ?>
|
||||
<ul>
|
||||
@ -312,9 +304,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
if ($force_install_noedit && $force_install_type) print '<input id="db_type" type="hidden" value="'.$force_install_type.'" name="db_type">';
|
||||
print '<select id="db_type" name="db_type'.(empty($force_install_noedit) || empty($force_install_type)?'':'_bis').'"'.($force_install_noedit && $force_install_type?' disabled="true"':'').'>';
|
||||
print $option;
|
||||
print '</select>';
|
||||
print '</select> </td>';
|
||||
|
||||
?></td>
|
||||
?>
|
||||
<td class="comment"><?php echo $langs->trans("DatabaseType"); ?></td>
|
||||
|
||||
</tr>
|
||||
@ -347,7 +339,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
<tr>
|
||||
<td class="label" valign="top"><b> <?php echo $langs->trans("DatabaseName"); ?> </b></td>
|
||||
|
||||
<td class="label" valign="top"><input type="text" id="db_name" name="db_name"
|
||||
<td class="label" valign="top"><input type="text" name="db_name"
|
||||
value="<?php echo (! empty($dolibarr_main_db_name))?$dolibarr_main_db_name:$force_install_database; ?>"></td>
|
||||
<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
|
||||
</tr>
|
||||
@ -366,7 +358,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
<tr>
|
||||
<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b>
|
||||
</td>
|
||||
<td class="label" valign="top"><input type="text" id="db_user" name="db_user"
|
||||
<td class="label" valign="top"><input type="text" name="db_user"
|
||||
value="<?php print (! empty($dolibarr_main_db_user))?$dolibarr_main_db_user:$force_install_databaselogin; ?>"></td>
|
||||
<td class="comment"><?php echo $langs->trans("AdminLogin"); ?></td>
|
||||
</tr>
|
||||
@ -374,7 +366,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
<tr>
|
||||
<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
|
||||
</td>
|
||||
<td class="label" valign="top"><input type="password" id="db_pass" name="db_pass"
|
||||
<td class="label" valign="top"><input type="password" name="db_pass"
|
||||
value="<?php print (! empty($dolibarr_main_db_pass))?$dolibarr_main_db_pass:$force_install_databasepass; ?>"></td>
|
||||
<td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>
|
||||
</tr>
|
||||
@ -383,7 +375,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
<td class="label" valign="top"><?php echo $langs->trans("CreateUser"); ?>
|
||||
</td>
|
||||
|
||||
<td class="label" valign="top"><input type="checkbox" id="db_create_user" name="db_create_user"
|
||||
<td class="label" valign="top"><input type="checkbox"
|
||||
id="db_create_user" name="db_create_user"
|
||||
<?php if (! empty($force_install_createuser)) print ' checked="on"'; ?>></td>
|
||||
<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
|
||||
</td>
|
||||
@ -400,7 +393,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
|
||||
<tr>
|
||||
<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
|
||||
<td class="label" valign="top"><input type="text" id="db_user_root" name="db_user_root" class="needroot"
|
||||
<td class="label" valign="top"><input type="text" name="db_user_root" class="needroot"
|
||||
value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td>
|
||||
<td class="label">
|
||||
<div class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
|
||||
@ -411,7 +404,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
||||
<tr>
|
||||
<td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
|
||||
</td>
|
||||
<td class="label" valign="top"><input type="password" id="db_pass_root" name="db_pass_root" class="needroot"
|
||||
<td class="label" valign="top"><input type="password" class="needroot"
|
||||
name="db_pass_root"
|
||||
value="<?php print (! empty($db_pass_root))?$db_pass_root:$force_install_databaserootpass; ?>"></td>
|
||||
<td class="label">
|
||||
<div class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>
|
||||
@ -442,9 +436,6 @@ jQuery(document).ready(function() {
|
||||
jQuery("#db_create_user").click(function() {
|
||||
init_needroot();
|
||||
});
|
||||
<?php if ($force_install_noedit) { ?>
|
||||
jQuery("#db_pass").focus();
|
||||
<?php } ?>
|
||||
});
|
||||
|
||||
function checkDatabaseName(databasename) {
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* \file htdocs/install/licence.php
|
||||
* \ingroup install
|
||||
* \brief Page to show licence (Removed from install process to save time)
|
||||
* \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
|
||||
* \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $
|
||||
*/
|
||||
|
||||
include_once("./inc.php");
|
||||
@ -33,9 +33,7 @@ $langs->setDefaultLang($setuplang);
|
||||
$langs->load("install");
|
||||
|
||||
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
|
||||
$useforcedwizard=false;
|
||||
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
|
||||
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
|
||||
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
|
||||
|
||||
dolibarr_install_syslog("Licence: Entering licence.php page");
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
|
||||
-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
|
||||
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
||||
|
||||
-- Regions Chile (id country=67)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
|
||||
-- Regions San Salvador (id country=86)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
|
||||
-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user