summaryrefslogtreecommitdiff
path: root/desktop/j4-dmenu-desktop/no_interactive_shell.diff
blob: 252130addca75edc1f5f9912d48e36c113c18fc0 (plain)
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
diff -Naur j4-dmenu-desktop-master/src/Applications.hh j4-dmenu-desktop-master.patched/src/Applications.hh
--- j4-dmenu-desktop-master/src/Applications.hh	2014-05-27 07:02:41.000000000 -0400
+++ j4-dmenu-desktop-master.patched/src/Applications.hh	2014-07-24 15:23:39.000000000 -0400
@@ -44,10 +44,11 @@
 		if((shell = getenv("SHELL")) == 0)
 		    shell = "/bin/sh";
 		
-		fprintf(stderr, "%s -i -c '%s'\n", shell, choice.c_str());
+		fprintf(stderr, "%s -c '%s'\n", shell, choice.c_str());
 		
 		// -i -c was tested with both bash and zsh.
-		exit(execl(shell, shell, "-i", "-c",  choice.c_str(), 0));
+		// 20140724 bkw: remove -i, it causes problems.
+		exit(execl(shell, shell, "-c",  choice.c_str(), 0));
 	    }
 
             // +1 b/c there must be whitespace we add back later...
diff -Naur j4-dmenu-desktop-master/src/Main.hh j4-dmenu-desktop-master.patched/src/Main.hh
--- j4-dmenu-desktop-master/src/Main.hh	2014-05-27 07:02:41.000000000 -0400
+++ j4-dmenu-desktop-master.patched/src/Main.hh	2014-07-24 15:28:38.000000000 -0400
@@ -47,9 +47,10 @@
             if((shell = getenv("SHELL")) == 0)
                 shell = "/bin/sh";
 
-	    fprintf(stderr, "%s -i -c '%s'\n", shell, command.c_str());
+	    fprintf(stderr, "%s -c '%s'\n", shell, command.c_str());
 
-            return execl(shell, shell, "-i", "-c", command.c_str(), 0);
+		 // 20140724 bkw: get rid of -i, it causes problems.
+            return execl(shell, shell, "-c", command.c_str(), 0);
         }
         return 0;
     }