From 9b2a8fbb9b0a53ca3b84ae0d9a32ba9b27c21272 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 29 Aug 2013 12:00:59 +0300 Subject: [PATCH] clean up --- .../xbmc/profile.d/01-xbmc-path.conf | 30 ------------------- .../xbmc/profile.d/02-xbmc-addon-path.conf | 2 +- packages/mediacenter/xbmc/scripts/xbmc-config | 2 -- .../mediacenter/xbmc/scripts/xbmc-userfonts | 2 -- packages/network/openssh/scripts/sshd-keygen | 10 +++---- .../busybox/profile.d/01-cache-path.conf | 28 ----------------- .../busybox/profile.d/01-userconfig-path.conf | 28 ----------------- packages/sysutils/dbus/profile.d/14-dbus.conf | 28 ----------------- .../xorg-server/scripts/xorg-configure | 2 -- 9 files changed, 5 insertions(+), 127 deletions(-) delete mode 100644 packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf delete mode 100644 packages/sysutils/busybox/profile.d/01-cache-path.conf delete mode 100644 packages/sysutils/busybox/profile.d/01-userconfig-path.conf delete mode 100644 packages/sysutils/dbus/profile.d/14-dbus.conf diff --git a/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf b/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf deleted file mode 100644 index 0724ee3329..0000000000 --- a/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf +++ /dev/null @@ -1,30 +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 -################################################################################ -# Mediacenter environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -XBMC_HOME="/usr/share/xbmc" -XBMC_USER_HOME="$HOME/.xbmc" - -export XBMC_HOME -export XBMC_USER_HOME diff --git a/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf index f991a07560..23f1e1f2f0 100644 --- a/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf +++ b/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf @@ -24,7 +24,7 @@ ################################################################################ # hack: add addons to $PATH - for addon in $XBMC_USER_HOME/addons/*/bin; do + for addon in /storage/.xbmc/addons/*/bin; do if [ -d "$addon" ] ; then PATH="$PATH:$addon" fi diff --git a/packages/mediacenter/xbmc/scripts/xbmc-config b/packages/mediacenter/xbmc/scripts/xbmc-config index 79c5468b5b..a90635c4ff 100755 --- a/packages/mediacenter/xbmc/scripts/xbmc-config +++ b/packages/mediacenter/xbmc/scripts/xbmc-config @@ -19,8 +19,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. /etc/profile - if [ -e /var/run/lirc/lircd.irtrans ]; then XBMC_ARGS="--lircdev /var/run/lirc/lircd.irtrans" else diff --git a/packages/mediacenter/xbmc/scripts/xbmc-userfonts b/packages/mediacenter/xbmc/scripts/xbmc-userfonts index 33c09c0fb7..7d50b65c75 100755 --- a/packages/mediacenter/xbmc/scripts/xbmc-userfonts +++ b/packages/mediacenter/xbmc/scripts/xbmc-userfonts @@ -19,8 +19,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. /etc/profile - SUBFONTS="/storage/.xbmc/userdata/fonts" # hack to support user installed fonts diff --git a/packages/network/openssh/scripts/sshd-keygen b/packages/network/openssh/scripts/sshd-keygen index 92b6d0d043..6086c22e61 100755 --- a/packages/network/openssh/scripts/sshd-keygen +++ b/packages/network/openssh/scripts/sshd-keygen @@ -19,15 +19,13 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. /etc/profile - -RSA1_KEY="$CONFIG_CACHE/ssh/ssh_host_key" -RSA2_KEY="$CONFIG_CACHE/ssh/ssh_host_rsa_key" -DSA2_KEY="$CONFIG_CACHE/ssh/ssh_host_dsa_key" +RSA1_KEY="/storage/.cache/ssh/ssh_host_key" +RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key" +DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key" KEYGEN="/usr/bin/ssh-keygen" -mkdir -p $CONFIG_CACHE/ssh +mkdir -p /storage/.cache/ssh # Check for the SSH1 RSA key if [ ! -s $RSA1_KEY ] ; then diff --git a/packages/sysutils/busybox/profile.d/01-cache-path.conf b/packages/sysutils/busybox/profile.d/01-cache-path.conf deleted file mode 100644 index 961bc9974c..0000000000 --- a/packages/sysutils/busybox/profile.d/01-cache-path.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. -################################################################################ - -CONFIG_CACHE="/storage/.cache" - -export CONFIG_CACHE diff --git a/packages/sysutils/busybox/profile.d/01-userconfig-path.conf b/packages/sysutils/busybox/profile.d/01-userconfig-path.conf deleted file mode 100644 index 0dd58f21b4..0000000000 --- a/packages/sysutils/busybox/profile.d/01-userconfig-path.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. -################################################################################ - -USER_CONFIG="/storage/.config" - -export USER_CONFIG diff --git a/packages/sysutils/dbus/profile.d/14-dbus.conf b/packages/sysutils/dbus/profile.d/14-dbus.conf deleted file mode 100644 index 0e11e556f8..0000000000 --- a/packages/sysutils/dbus/profile.d/14-dbus.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 -################################################################################ -# setup functions -################################################################################ - - wait_for_dbus () { - while [ ! -e /var/run/dbus/system_bus_socket ]; do - usleep 1000000 - done - } - diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure index 34b52f5eca..9150f048c1 100755 --- a/packages/x11/xserver/xorg-server/scripts/xorg-configure +++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure @@ -20,8 +20,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. /etc/profile - ################################################################################ # creating needed directories and symlinks ################################################################################