From 83a284fff2b8b6cac797f0b8a4c20c37ff2d5822 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 17 Oct 2013 21:04:15 +0300 Subject: [PATCH] busybox: merge profile.d scripts --- .../{00-home-path.conf => 00-busybox.conf} | 22 +++++---- .../busybox/profile.d/00-path-variable.conf | 28 ----------- .../busybox/profile.d/01-hostname.conf | 28 ----------- .../sysutils/busybox/profile.d/02-shell.conf | 46 ------------------- 4 files changed, 14 insertions(+), 110 deletions(-) rename packages/sysutils/busybox/profile.d/{00-home-path.conf => 00-busybox.conf} (76%) delete mode 100644 packages/sysutils/busybox/profile.d/00-path-variable.conf delete mode 100644 packages/sysutils/busybox/profile.d/01-hostname.conf delete mode 100644 packages/sysutils/busybox/profile.d/02-shell.conf diff --git a/packages/sysutils/busybox/profile.d/00-home-path.conf b/packages/sysutils/busybox/profile.d/00-busybox.conf similarity index 76% rename from packages/sysutils/busybox/profile.d/00-home-path.conf rename to packages/sysutils/busybox/profile.d/00-busybox.conf index 3ca6cd73d9..2e4aaa23f4 100644 --- a/packages/sysutils/busybox/profile.d/00-home-path.conf +++ b/packages/sysutils/busybox/profile.d/00-busybox.conf @@ -17,12 +17,18 @@ # the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# Core (PATH) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ -HOME="/storage" - -export HOME +export HOME="/storage" +export PATH="/bin:/sbin:/usr/bin:/usr/sbin" +export HOSTNAME=`cat /etc/hostname` +export PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ " +case "$TERM" in + linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color) + ;; + "") + export TERM="linux" + ;; + *) + export TERM="xterm" + ;; +esac diff --git a/packages/sysutils/busybox/profile.d/00-path-variable.conf b/packages/sysutils/busybox/profile.d/00-path-variable.conf deleted file mode 100644 index 0866b8bc0a..0000000000 --- a/packages/sysutils/busybox/profile.d/00-path-variable.conf +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# Core (PATH) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -PATH="/bin:/sbin:/usr/bin:/usr/sbin" - -export PATH diff --git a/packages/sysutils/busybox/profile.d/01-hostname.conf b/packages/sysutils/busybox/profile.d/01-hostname.conf deleted file mode 100644 index 069a85f65f..0000000000 --- a/packages/sysutils/busybox/profile.d/01-hostname.conf +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# Core (Shell) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -HOSTNAME=`cat /etc/hostname` - -export HOSTNAME diff --git a/packages/sysutils/busybox/profile.d/02-shell.conf b/packages/sysutils/busybox/profile.d/02-shell.conf deleted file mode 100644 index 2bab1c6eab..0000000000 --- a/packages/sysutils/busybox/profile.d/02-shell.conf +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# Core (Shell) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ " -export PS1 - -case "$TERM" in - - # Do nothing when TERM already set (e.g. by SSH) and known - (linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color) - ;; - - # Default to "linux" when unset - ("") - TERM="linux" - ;; - - # Default to "xterm" when unknown - (*) - TERM="xterm" - ;; - -esac -export TERM