[GRASS-SVN] r70235 - in grass/trunk: general/g.proj scripts/g.extension tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jan 4 03:28:48 PST 2017
Author: martinl
Date: 2017-01-04 03:28:48 -0800 (Wed, 04 Jan 2017)
New Revision: 70235
Modified:
grass/trunk/general/g.proj/output.c
grass/trunk/scripts/g.extension/g.extension.py
grass/trunk/tools/mkhtml.py
Log:
broken links to source code and history in add-ons user manuals (see #3224)
Modified: grass/trunk/general/g.proj/output.c
===================================================================
--- grass/trunk/general/g.proj/output.c 2017-01-04 10:32:05 UTC (rev 70234)
+++ grass/trunk/general/g.proj/output.c 2017-01-04 11:28:48 UTC (rev 70235)
@@ -30,7 +30,7 @@
void print_projinfo(int shell, const char *force_epsg)
{
- int i;
+ int i, quote;
char path[GPATH_MAX];
if (check_xy(shell))
@@ -40,10 +40,19 @@
fprintf(stdout,
"-PROJ_INFO-------------------------------------------------\n");
for (i = 0; i < projinfo->nitems; i++) {
- if (shell)
- fprintf(stdout, "%s=%s\n", projinfo->key[i], projinfo->value[i]);
- else
- fprintf(stdout, "%-11s: %s\n", projinfo->key[i], projinfo->value[i]);
+ quote = FALSE;
+ if (strcmp(projinfo->key[i], "name") == 0)
+ quote = TRUE;
+
+ if (shell) {
+ if (quote)
+ fprintf(stdout, "%s=\"%s\"\n", projinfo->key[i], projinfo->value[i]);
+ else
+ fprintf(stdout, "%s=%s\n", projinfo->key[i], projinfo->value[i]);
+ }
+ else {
+ fprintf(stdout, "%-11s: %s\n", projinfo->key[i], projinfo->value[i]);
+ }
}
/* EPSG code is preserved for historical metadata interest only:
Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py 2017-01-04 10:32:05 UTC (rev 70234)
+++ grass/trunk/scripts/g.extension/g.extension.py 2017-01-04 11:28:48 UTC (rev 70235)
@@ -1125,6 +1125,8 @@
def install_extension_std_platforms(name, source, url):
"""Install extension on standard platforms"""
gisbase = os.getenv('GISBASE')
+ source_url = "https://trac.osgeo.org/grass/browser/grass-addons/grass7/"
+
if source == 'official':
gscript.message(_("Fetching <%s> from "
"GRASS GIS Addons repository (be patient)...") % name)
@@ -1167,7 +1169,8 @@
'MANBASEDIR=%s' % dirs['man'],
'SCRIPTDIR=%s' % dirs['script'],
'STRINGDIR=%s' % dirs['string'],
- 'ETC=%s' % os.path.join(dirs['etc'])
+ 'ETC=%s' % os.path.join(dirs['etc']),
+ 'SOURCE_URL=%s' % source_url
]
install_cmd = [
Modified: grass/trunk/tools/mkhtml.py
===================================================================
--- grass/trunk/tools/mkhtml.py 2017-01-04 10:32:05 UTC (rev 70234)
+++ grass/trunk/tools/mkhtml.py 2017-01-04 11:28:48 UTC (rev 70235)
@@ -305,8 +305,14 @@
topdir = os.path.abspath(os.getenv("MODULE_TOPDIR"))
curdir = os.path.abspath(os.path.curdir)
pgmdir = curdir.replace(topdir, '').lstrip('/')
-url_source = urlparse.urljoin(source_url, pgmdir)
-
+if os.getenv('SOURCE_URL', ''):
+ # addons
+ pgmname = os.path.basename(pgmdir)
+ classname = index_names[pgmname[:pgmname.find('.')]]
+ url_source = urlparse.urljoin('{}{}/'.format(os.environ['SOURCE_URL'], classname),
+ pgmname)
+else:
+ url_source = urlparse.urljoin(source_url, pgmdir)
if index_name:
sys.stdout.write(sourcecode.substitute(URL_SOURCE=url_source, PGM=pgm,
URL_LOG=url_source.replace('browser', 'log')))
More information about the grass-commit
mailing list