Update upstream version -> Remove prepare() in favor of upstream install script + Update install instructions

This commit is contained in:
Philipp Schmitt 2014-04-11 23:52:19 +02:00
parent 3e1e0da5cc
commit d5d5cda807
3 changed files with 6 additions and 22 deletions

View file

@ -1,6 +1,6 @@
pkgbase = wallabag pkgbase = wallabag
pkgdesc = Self hostable application for saving web pages pkgdesc = Self hostable application for saving web pages
pkgver = 1.5.1.1 pkgver = 1.6.1
pkgrel = 1 pkgrel = 1
url = http://www.wallabag.org/ url = http://www.wallabag.org/
install = wallabag.install install = wallabag.install
@ -13,9 +13,9 @@ pkgbase = wallabag
optdepends = php-sqlite: For sqlite storage optdepends = php-sqlite: For sqlite storage
optdepends = php-pgsql: For postgres storage optdepends = php-pgsql: For postgres storage
options = !strip options = !strip
source = https://github.com/wallabag/wallabag/archive/1.5.1.1.tar.gz source = https://github.com/wallabag/wallabag/archive/1.6.1.tar.gz
source = vendor.zip::http://wllbg.org/vendor source = vendor.zip::http://wllbg.org/vendor
sha256sums = d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f sha256sums = ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42
sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12 sha256sums = bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12
pkgname = wallabag pkgname = wallabag

View file

@ -1,7 +1,7 @@
# Maintainer: Philipp Schmitt (philipp<at>schmitt<dot>co) # Maintainer: Philipp Schmitt (philipp<at>schmitt<dot>co)
pkgname=wallabag pkgname=wallabag
pkgver=1.5.1.1 pkgver=1.6.1
pkgrel=1 pkgrel=1
pkgdesc='Self hostable application for saving web pages' pkgdesc='Self hostable application for saving web pages'
arch=('any') arch=('any')
@ -13,25 +13,9 @@ install="$pkgname.install"
options=(!strip) options=(!strip)
source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz" source=("https://github.com/wallabag/wallabag/archive/${pkgver}.tar.gz"
"vendor.zip::http://wllbg.org/vendor") "vendor.zip::http://wllbg.org/vendor")
sha256sums=('d0d63e5efe56ea28c4ebda2a0ea84162d75c9f7899fccb45aa3fb3e7afc12f5f' sha256sums=('ff3cd32235fbc1247dd93faff2b355c7aec1368bc96c5a85da954e0aee1c7d42'
'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12') 'bd3e843290de28f1c20fa19ed746ca221c9174cb7f0a9723618f21bddb883e12')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
local default_config=inc/poche/config.inc.php.new
# Salt
local salt=$(< /dev/urandom tr -dc A-Za-z0-9_ | head -c100 | sha512sum | awk '{ print $1 }')
sed -i "s/\('SALT',\).*'/\1 '${salt}'/" $default_config
# Change default storage to mysql
sed -i "s/\('STORAGE',\).*'/\1 'mysql'/" $default_config
# Change default database name
sed -i "s/\('STORAGE_DB',\).*'/\1 '${pkgname}'/" $default_config
# Change default user
sed -i "s/\('STORAGE_USER',\).*'/\1 '${pkgname}'/" $default_config
# Change default password
sed -i "s/\('STORAGE_PASSWORD',\).*'/\1 '${pkgname}'/" $default_config
}
package() { package() {
cd "${pkgdir}" cd "${pkgdir}"
mkdir -p usr/share/webapps mkdir -p usr/share/webapps

View file

@ -8,7 +8,7 @@ post_install() {
- Initialize the database: - Initialize the database:
$ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql $ mysql -u root -p wallabag < /usr/share/webapps/wallabag/install/mysql.sql
- Create a config file: - Create a config file:
$ cp /usr/share/webapps/wallabag/inc/poche/config.inc.php.new /usr/share/webapps/wallabag/inc/poche/config.inc.php # cp /usr/share/webapps/wallabag/inc/poche/config.inc.php{.new,}
- Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres) - Adjust your prefered STORAGE_SERVER (mysql, sqlite, postgres)
- Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD - Set the database credentials: STORAGE_SERVER, STORAGE_DB, STORAGE_USER, STORAGE_PASSWORD
- *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install) - *Optional*: Adjust the SALT value in config.inc.php (it was autogenerated during install)