From 3d4caa6b6da0630272741ad16db1b52bf4af3031 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 22 Feb 2016 07:52:45 +0100 Subject: [PATCH] buildsystem: move $HOME/.openelec/$PROJECT to $HOME/.openelec/projects/$PROJECT Signed-off-by: Stephan Raue --- config/options | 4 ++-- config/path | 2 +- scripts/image | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/options b/config/options index 4aed88c5f3..e00d0e4446 100644 --- a/config/options +++ b/config/options @@ -90,8 +90,8 @@ fi if [ -f "$HOME/.openelec/options" ]; then . $HOME/.openelec/options fi - if [ -f "$HOME/.openelec/$PROJECT/options" ]; then - . $HOME/.openelec/$PROJECT/options + if [ -f "$HOME/.openelec/projects/$PROJECT/options" ]; then + . $HOME/.openelec/projects/$PROJECT/options fi # read distro options from $HOME if available diff --git a/config/path b/config/path index dbf24cd084..275174044a 100644 --- a/config/path +++ b/config/path @@ -78,7 +78,7 @@ SED="sed -i" PKG_DIR="" # check project folder for a package in home dir - for DIR in $(find $HOME/.openelec/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do + for DIR in $(find $HOME/.openelec/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do if [ -r "$DIR/package.mk" ]; then # found first, set $PKG_DIR PKG_DIR="$DIR" diff --git a/scripts/image b/scripts/image index 9d6f35b826..59505e3555 100755 --- a/scripts/image +++ b/scripts/image @@ -192,10 +192,10 @@ fi fi # copy vendor project related files to filesystem - if [ -d "$HOME/.openelec/$PROJECT/filesystem" ]; then - cp -PR $HOME/.openelec/$PROJECT/filesystem/* $INSTALL + if [ -d "$HOME/.openelec/projects/$PROJECT/filesystem" ]; then + cp -PR $HOME/.openelec/projects/$PROJECT/filesystem/* $INSTALL # install project specific systemd services - for service in $HOME/.openelec/$PROJECT/filesystem/usr/lib/systemd/system/*.service ; do + for service in $HOME/.openelec/projects/$PROJECT/filesystem/usr/lib/systemd/system/*.service ; do if [ -f "$service" ] ; then enable_service $(basename $service) fi