Overview
Comment: | Install welcome plugin if it exists |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
46bc707429d139f6b3d594415e3a9f6d |
User & Date: | bohwaz on 2020-12-03 00:36:36 |
Other Links: | branch diff | manifest | tags |
Context
2020-12-03
| ||
22:39 | Order fees by cost, then label check-in: 77c3e9fa9b user: bohwaz tags: dev | |
00:36 | Install welcome plugin if it exists check-in: 46bc707429 user: bohwaz tags: dev | |
00:36 | Send plugin root as one of parameters passed to events check-in: f5d8c70106 user: bohwaz tags: dev | |
Changes
Modified debian/makedeb.sh from [00b4e03f70] to [e75e803576].
︙ | ︙ | |||
34 35 36 37 38 39 40 | mkdir -p "${DEBLOCALPREFIX}/share/applications" cp ${THISDIR}/garradin.desktop "${DEBLOCALPREFIX}/share/applications/" CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} cp ${THISDIR}/config.debian.php ${CODEDIR}/config.local.php | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | mkdir -p "${DEBLOCALPREFIX}/share/applications" cp ${THISDIR}/garradin.desktop "${DEBLOCALPREFIX}/share/applications/" CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} cp ${THISDIR}/config.debian.php ${CODEDIR}/config.local.php rm -rf ${CODEDIR}/*.sqlite ${CODEDIR}/cache ${CODEDIR}/www/squelettes ${CODEDIR}/www/plugins/* cp ${THISDIR}/garradin.png "${CODEDIR}" mkdir -p "${DEBROOT}/var/lib/${PACKAGE_DEBNAME}" mkdir -p "${DEBROOT}/var/cache/${PACKAGE_DEBNAME}" mkdir -p "${DEBROOT}/etc/${PACKAGE_DEBNAME}" # Cleaning files that will be copied to /usr/share/doc |
︙ | ︙ |
Modified src/Makefile from [530c679c07] to [c8d389d4f3].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | rsync --files-from=dependencies.list -r ./ /tmp/garradin-build/garradin/src/include/lib/ mv www/admin/static/mini.css /tmp/garradin-build/garradin/src/www/admin/static/admin.css cd /tmp/garradin-build/garradin/src/www/admin/static; \ rm -f styles/[0-9]*.css; \ rm -f font/*.css font/*.json cd /tmp/garradin-build/garradin/src; \ rm -f Makefile include/lib/KD2/data/countries.en.json mv /tmp/garradin-build/garradin/src /tmp/garradin-build/garradin-${VERSION} @#cd /tmp/garradin-build/; zip -r -9 garradin-${VERSION}.zip garradin-${VERSION}; @#mv -f /tmp/garradin-build/garradin-${VERSION}.zip ./ tar cjvfh garradin-${VERSION}.tar.bz2 -C /tmp/garradin-build garradin-${VERSION} deb: cd ../debian; ./makedeb.sh | > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | rsync --files-from=dependencies.list -r ./ /tmp/garradin-build/garradin/src/include/lib/ mv www/admin/static/mini.css /tmp/garradin-build/garradin/src/www/admin/static/admin.css cd /tmp/garradin-build/garradin/src/www/admin/static; \ rm -f styles/[0-9]*.css; \ rm -f font/*.css font/*.json cd /tmp/garradin-build/garradin/src; \ rm -f Makefile include/lib/KD2/data/countries.en.json cd /tmp/garradin-build/garradin/src/plugins; \ wget https://fossil.kd2.org/garradin-plugins/uv/welcome.tar.gz mv /tmp/garradin-build/garradin/src /tmp/garradin-build/garradin-${VERSION} @#cd /tmp/garradin-build/; zip -r -9 garradin-${VERSION}.zip garradin-${VERSION}; @#mv -f /tmp/garradin-build/garradin-${VERSION}.zip ./ tar cjvfh garradin-${VERSION}.tar.bz2 -C /tmp/garradin-build garradin-${VERSION} deb: cd ../debian; ./makedeb.sh |
︙ | ︙ |
Modified src/include/lib/Garradin/Install.php from [f40229806d] to [a5c31079aa].
︙ | ︙ | |||
203 204 205 206 207 208 209 210 211 212 213 214 215 216 | 'order' => 't.id', 'desc' => false, 'limit' => '100', ]; $recherche = new Recherche; $recherche->add('Écritures sans projet', null, $recherche::TYPE_JSON, 'compta', $query); return $config->save(); } static public function checkAndCreateDirectories() { // Vérifier que les répertoires vides existent, sinon les créer | > > > > > > > | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | 'order' => 't.id', 'desc' => false, 'limit' => '100', ]; $recherche = new Recherche; $recherche->add('Écritures sans projet', null, $recherche::TYPE_JSON, 'compta', $query); // Install welcome plugin if available $has_welcome_plugin = Plugin::getPath('welcome', false); if ($has_welcome_plugin) { Plugin::install('welcome', true); } return $config->save(); } static public function checkAndCreateDirectories() { // Vérifier que les répertoires vides existent, sinon les créer |
︙ | ︙ |