diff options
| author | Charles Brunet | 2015-11-03 10:25:32 -0500 |
|---|---|---|
| committer | Charles Brunet | 2015-11-03 10:26:48 -0500 |
| commit | 8f7fd5c6d9edd447ad717af23e97c294124b06c9 (patch) | |
| tree | 1a1df377e8b38dfd81f1fad1bd391ec06968a4c2 | |
| parent | d5010601c1781a42fcd07828c4d658c0500cb5c1 (diff) | |
| download | aur-8f7fd5c6d9edd447ad717af23e97c294124b06c9.tar.gz | |
Install script upgrade
- Corrected apache.conf example
- Suppressed install script output
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | apache.conf.example | 2 | ||||
| -rw-r--r-- | dolibarr.install | 17 |
4 files changed, 18 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = dolibarr pkgdesc = ERP/CRM for small and medium companies pkgver = 3.8.1 - pkgrel = 1 + pkgrel = 2 url = http://www.dolibarr.org/ install = dolibarr.install arch = any @@ -16,7 +16,7 @@ pkgbase = dolibarr source = apache.conf.example md5sums = d8b0b1c57b6a88cb50cdf913662a8e32 md5sums = 7ba6f2def8caabbd8321d91067c01b16 - md5sums = 49d7f5ecb07ee9067fd995eb57b8e4c7 + md5sums = d468572a7aa663d958c302b3e15147f1 pkgname = dolibarr @@ -2,7 +2,7 @@ # Contributor: Okki <okki666@free.fr> pkgname=dolibarr pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="ERP/CRM for small and medium companies" arch=('any') url="http://www.dolibarr.org/" @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/project/$pkgname/Dolibarr%20ERP-CRM/$p apache.conf.example) md5sums=('d8b0b1c57b6a88cb50cdf913662a8e32' '7ba6f2def8caabbd8321d91067c01b16' - '49d7f5ecb07ee9067fd995eb57b8e4c7') + 'd468572a7aa663d958c302b3e15147f1') prepare() { sed -e "3,5d" \ diff --git a/apache.conf.example b/apache.conf.example index bfa8be4b34af..2d0675eb821d 100644 --- a/apache.conf.example +++ b/apache.conf.example @@ -1,5 +1,5 @@ Alias /dolibarr "/usr/share/webapps/dolibarr" -<Directory "/usr/share/webapps/dolibarr"> +<Directory "/usr/share/webapps/dolibarr/htdocs"> DirectoryIndex index.html index.php AllowOverride All Options FollowSymlinks diff --git a/dolibarr.install b/dolibarr.install index c0731d198953..8b6af59f17ca 100644 --- a/dolibarr.install +++ b/dolibarr.install @@ -9,11 +9,20 @@ post_install() { post_upgrade() { old=`expr $2 : '\([0-9]*\.[0-9]*\.\)'`"0" new=`expr $1 : '\([0-9]*\.[0-9]*\.\)'`"0" + if [ $old == $new ] + then + if [ $old == '3.8.0' ] + then + old='3.7.0' + fi + fi rm var/lib/dolibarr/install.lock cd usr/share/webapps/dolibarr/htdocs/install - php upgrade.php $old $new - php upgrade2.php $old $new + echo 'upgrade.php' $old $new + php upgrade.php $old $new > /dev/null + echo 'upgrade2.php' $old $new + php upgrade2.php $old $new > /dev/null cd / - touch var/lib/dolibarr/install.lock - chmod 444 var/lib/dolibarr/install.lock + #touch var/lib/dolibarr/install.lock + #chmod 444 var/lib/dolibarr/install.lock } |