浏览代码

Don't use GRASS_SH

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37926 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 16 年之前
父节点
当前提交
6dbd59052d
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      general/g.parser/main.c

+ 2 - 6
general/g.parser/main.c

@@ -392,14 +392,10 @@ int main(int argc, char *argv[])
 	 * immediately and that breaks scripts running GRASS scripts
 	 * immediately and that breaks scripts running GRASS scripts
 	 * because they dont wait until GRASS script finished */
 	 * because they dont wait until GRASS script finished */
 	/* execlp( "sh", "sh", filename, "@ARGS_PARSED@", NULL); */
 	/* execlp( "sh", "sh", filename, "@ARGS_PARSED@", NULL); */
-	/* _spawnlp ( _P_OVERLAY, "sh", "sh", filename, "@ARGS_PARSED@", NULL ); */
+	/* _spawnlp ( _P_OVERLAY, filename, filename, "@ARGS_PARSED@", NULL ); */
 	int ret;
 	int ret;
-	char *shell = getenv("GRASS_SH");
 
 
-	if (shell == NULL)
-	    shell = "sh";
-	ret =
-	    _spawnlp(_P_WAIT, shell, shell, filename, "@ARGS_PARSED@", NULL);
+	ret = _spawnlp(_P_WAIT, filename, filename, "@ARGS_PARSED@", NULL);
 	G_debug(1, "ret = %d", ret);
 	G_debug(1, "ret = %d", ret);
 	if (ret == -1) {
 	if (ret == -1) {
 	    perror("_spawnlp() failed");
 	    perror("_spawnlp() failed");