Patchwork [v2] base-files: set dynamic COLUMNS via resize command

login
register
mail settings
Submitter Ting Liu
Date July 30, 2014, 10:23 a.m.
Message ID <1406715821-2892-1-git-send-email-ting.liu@freescale.com>
Download mbox | patch
Permalink /patch/76933/
State Accepted
Commit 73c481d2cbc3e7c7ef9f594126aec581ec75b689
Headers show

Comments

Ting Liu - July 30, 2014, 10:23 a.m.
From: Ting Liu <ting.liu@freescale.com>

By default, COLUMNS is set to 80. If possible, run 'resize' to
determine what the current dimensions are. This avoids the final
part of long lines overlap the start of the same line.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
changes in v2:
* dynamically check for ${bindir} instead of hard code /usr/bin

 meta/recipes-core/base-files/base-files/profile   |    4 ++++
 meta/recipes-core/base-files/base-files_3.0.14.bb |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)
Martin Jansa - July 30, 2014, 10:48 a.m.
On Wed, Jul 30, 2014 at 06:23:41PM +0800, ting.liu@freescale.com wrote:
> From: Ting Liu <ting.liu@freescale.com>
> 
> By default, COLUMNS is set to 80. If possible, run 'resize' to
> determine what the current dimensions are. This avoids the final
> part of long lines overlap the start of the same line.
> 
> Signed-off-by: Ting Liu <ting.liu@freescale.com>
> ---
> changes in v2:
> * dynamically check for ${bindir} instead of hard code /usr/bin
> 
>  meta/recipes-core/base-files/base-files/profile   |    4 ++++
>  meta/recipes-core/base-files/base-files_3.0.14.bb |    4 ++++
>  2 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
> index 0b2d9d7..88ab8d8 100644
> --- a/meta/recipes-core/base-files/base-files/profile
> +++ b/meta/recipes-core/base-files/base-files/profile
> @@ -26,6 +26,10 @@ if [ -d /etc/profile.d ]; then
>    unset i
>  fi
>  
> +if [ -x /usr/bin/resize ];then
> +  /usr/bin/resize >/dev/null
> +fi
> +
>  export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
>  
>  umask 022
> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
> index 30b1bf4..e6109dd 100644
> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
> @@ -102,6 +102,10 @@ do_install () {
>  	install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
>  	install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
>  
> +    if [ "/usr/bin" != "${bindir}" ]; then
> +        sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile
> +    fi
> +

Please use consistent whitespace for indentation (I know it's hard with
inconsistent styleguide, but please don't mix tabs and spaces for
indentation).

>  	ln -sf /proc/mounts ${D}${sysconfdir}/mtab
>  }
>  
> -- 
> 1.7.3.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 0b2d9d7..88ab8d8 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -26,6 +26,10 @@  if [ -d /etc/profile.d ]; then
   unset i
 fi
 
+if [ -x /usr/bin/resize ];then
+  /usr/bin/resize >/dev/null
+fi
+
 export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
 
 umask 022
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 30b1bf4..e6109dd 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -102,6 +102,10 @@  do_install () {
 	install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
 	install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
 
+    if [ "/usr/bin" != "${bindir}" ]; then
+        sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile
+    fi
+
 	ln -sf /proc/mounts ${D}${sysconfdir}/mtab
 }