Overview
Comment: | Améliorations paquet debian |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
76f1270cd61d7d4f3e2908618a75252d |
User & Date: | bohwaz on 2014-04-23 05:51:21 |
Other Links: | manifest | tags |
Context
2014-04-23
| ||
05:52 | Le bon chemin debian check-in: 88aacaa41a user: bohwaz tags: trunk | |
05:51 | Améliorations paquet debian check-in: 76f1270cd6 user: bohwaz tags: trunk | |
2014-04-22
| ||
00:32 | Petites améliorations expérience sur mobile check-in: 70a64c37ce user: bohwaz tags: trunk | |
Changes
Added debian/config.debian.php version [5d75045997].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | <?php namespace Garradin; if (!empty($_ENV['GARRADIN_STANDALONE'])) { $home = $_ENV['HOME']; if (empty($_ENV['XDG_CONFIG_HOME'])) { $_ENV['XDG_CONFIG_HOME'] = $home . '/.config'; } if (empty($_ENV['XDG_DATA_HOME'])) { $_ENV['XDG_DATA_HOME'] = $home . '/.local/share'; } if (!file_exists($_ENV['XDG_DATA_HOME'] . '/garradin')) { mkdir($_ENV['XDG_DATA_HOME'] . '/garradin'); } define('Garradin\DATA_ROOT', $_ENV['XDG_DATA_HOME'] . '/garradin'); $last_file = $_ENV['XDG_CONFIG_HOME'] . '/garradin/last'; if ($_ENV['GARRADIN_STANDALONE'] != 1) { $last_sqlite = trim($_ENV['GARRADIN_STANDALONE']); } else if (file_exists($last_file)) { $last_sqlite = trim(file_get_contents($last_file)); } else { $last_sqlite = $_ENV['XDG_DATA_HOME'] . '/garradin/association.sqlite'; } if (!file_exists($_ENV['XDG_CONFIG_HOME'] . '/garradin')) { mkdir($_ENV['XDG_CONFIG_HOME'] . '/garradin'); } file_put_contents($last_file, $last_sqlite); define('Garradin\DB_FILE', $last_sqlite); define('Garradin\LOCAL_LOGIN', 1); } |
Modified debian/garradin from [f8dae1f71d] to [a5cb206d24].
1 2 3 | #!/bin/sh ROOT=/usr/share/garradin/www | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | #!/bin/sh ROOT=/usr/share/garradin/www ROOT=~/fossil/garradin/src/www ROUTER=${ROOT}/_route.php PORT=8088 ADDRESS=localhost VERBOSE=0 # Execute getopt ARGS=`getopt -o "p:vh" -l "port:,verbose,help" -n "garradin" -- "$@"` # Bad arguments if [ $? -ne 0 ]; then exit 1 fi # A little magic eval set -- "$ARGS" # Now go through all the options while true; do case "$1" in -p|--port) PORT=$2 shift;; |
︙ | ︙ | |||
69 70 71 72 73 74 75 | --) shift break;; esac done | | > > > > > > > > > > | < | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | --) shift break;; esac done CMD="$1" [ "$CMD" = "" ] && { CMD="ui" } PROJECT="$2" [ "$PROJECT" = "" ] && PROJECT="1" export GARRADIN_STANDALONE="$PROJECT" [ $VERBOSE = 1 ] && { php -S ${ADDRESS}:${PORT} -t ${ROOT} -d variables_order=EGPCS ${ROUTER} & } || { php -S ${ADDRESS}:${PORT} -t ${ROOT} -d variables_order=EGPCS ${ROUTER} > /dev/null 2>&1 & } php_pid=$! sleep .5 [ "$CMD" = "ui" ] && { URL="http://${ADDRESS}:${PORT}/" [ "$DISPLAY" != "" ] && { x-www-browser ${URL} & } || { www-browser ${URL} & } wait $! kill $php_pid } || { wait $php_pid } |
Modified debian/makedeb.sh from [e2b7e71d84] to [8e360813d3].
︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | mkdir -p ${BINDIR} mkdir -p ${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME} cp ${THISDIR}/garradin ${BINDIR} CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} # Cleaning files that will be copied to /usr/share/doc rm -f ${CODEDIR}/{README,COPYING} cd $DEBROOT || { echo "Debian dest dir [$DEBROOT] not found. :(" exit 2 | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | mkdir -p ${BINDIR} mkdir -p ${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME} cp ${THISDIR}/garradin ${BINDIR} CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} cp ${THISDIR}/config.debian.php ${CODEDIR}/config.local.php # Cleaning files that will be copied to /usr/share/doc rm -f ${CODEDIR}/{README,COPYING} cd $DEBROOT || { echo "Debian dest dir [$DEBROOT] not found. :(" exit 2 |
︙ | ︙ | |||
90 91 92 93 94 95 96 | echo "Generating ${CONTROL}..." cat <<EOF > ${CONTROL} Package: ${PACKAGE_DEBNAME} Section: web Priority: optional Maintainer: Garradin <garradin@kd2.org> Architecture: ${DEB_ARCH_NAME} | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | echo "Generating ${CONTROL}..." cat <<EOF > ${CONTROL} Package: ${PACKAGE_DEBNAME} Section: web Priority: optional Maintainer: Garradin <garradin@kd2.org> Architecture: ${DEB_ARCH_NAME} Depends: dash | bash, php5-cli (>=5.4), php5-sqlite Version: ${PACKAGE_DEB_VERSION} Suggests: www-browser Homepage: http://garradin.kd2.org/ Description: Garradin is a tool to manage non-profit organizations. It's only available in french. Description-fr: Gestionnaire d'association en interface web ou CLI. Garradin est un gestionnaire d'association à but non lucratif. |
︙ | ︙ |
Modified src/include/init.php from [099e752c34] to [dff3fd824c].
︙ | ︙ | |||
42 43 44 45 46 47 48 | return false; } /* * Configuration globale */ | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | return false; } /* * Configuration globale */ // Configuration externalisée if (file_exists(__DIR__ . '/../config.local.php')) { require __DIR__ . '/../config.local.php'; } if (!defined('Garradin\ROOT')) { |
︙ | ︙ |
Added src/www/_route.php version [af38449459].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | <?php namespace Garradin; // Routeur pour l'utilisation avec le serveur web intégré à PHP const WWW_URI = '/'; //const WWW_URL = '/'; $uri = $_SERVER['REQUEST_URI']; if (($pos = strpos($uri, '?')) !== false) { $uri = substr($uri, 0, $pos); } if (file_exists(__DIR__ . $uri)) { return false; } elseif (preg_match('!/admin/plugin/(.+)/(.*)!', $uri, $match)) { $_GET['_p'] = $match[1]; $_GET['_u'] = $match[2]; require __DIR__ . '/admin/plugin.php'; } else { require __DIR__ . '/index.php'; } |