mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/1] defaultenv-2: move ps1 to base/init/ps1
@ 2013-01-19  7:37 Jean-Christophe PLAGNIOL-VILLARD
  2013-01-21  8:04 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-01-19  7:37 UTC (permalink / raw)
  To: barebox

so we can overwrite it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv-2/base/bin/init |    6 ------
 defaultenv-2/base/init/ps1 |    9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 defaultenv-2/base/init/ps1

diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
index bb4abcd..2a1f6a1 100644
--- a/defaultenv-2/base/bin/init
+++ b/defaultenv-2/base/bin/init
@@ -15,12 +15,6 @@ global editcmd=sedit
 
 /env/config
 
-if [ ${global.allow_color} = "true" ]; then
-        export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
-else
-        export PS1="barebox@\h:\w "
-fi
-
 if [ -e /env/menu ]; then
 	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
 else
diff --git a/defaultenv-2/base/init/ps1 b/defaultenv-2/base/init/ps1
new file mode 100644
index 0000000..fcbf4b6
--- /dev/null
+++ b/defaultenv-2/base/init/ps1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+/env/config
+
+if [ ${global.allow_color} = "true" ]; then
+        export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
+else
+        export PS1="barebox@\h:\w "
+fi
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] defaultenv-2: move ps1 to base/init/ps1
  2013-01-19  7:37 [PATCH 1/1] defaultenv-2: move ps1 to base/init/ps1 Jean-Christophe PLAGNIOL-VILLARD
@ 2013-01-21  8:04 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2013-01-21  8:04 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Sat, Jan 19, 2013 at 08:37:55AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> so we can overwrite it
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  defaultenv-2/base/bin/init |    6 ------
>  defaultenv-2/base/init/ps1 |    9 +++++++++
>  2 files changed, 9 insertions(+), 6 deletions(-)
>  create mode 100644 defaultenv-2/base/init/ps1
> 
> diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
> index bb4abcd..2a1f6a1 100644
> --- a/defaultenv-2/base/bin/init
> +++ b/defaultenv-2/base/bin/init
> @@ -15,12 +15,6 @@ global editcmd=sedit
>  
>  /env/config
>  
> -if [ ${global.allow_color} = "true" ]; then
> -        export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
> -else
> -        export PS1="barebox@\h:\w "
> -fi
> -
>  if [ -e /env/menu ]; then
>  	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
>  else
> diff --git a/defaultenv-2/base/init/ps1 b/defaultenv-2/base/init/ps1
> new file mode 100644
> index 0000000..fcbf4b6
> --- /dev/null
> +++ b/defaultenv-2/base/init/ps1
> @@ -0,0 +1,9 @@
> +#!/bin/sh
> +
> +/env/config
> +
> +if [ ${global.allow_color} = "true" ]; then
> +        export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
> +else
> +        export PS1="barebox@\h:\w "
> +fi
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-01-21  8:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-19  7:37 [PATCH 1/1] defaultenv-2: move ps1 to base/init/ps1 Jean-Christophe PLAGNIOL-VILLARD
2013-01-21  8:04 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox