diff options
| author | Simon Rettberg | 2013-05-21 15:35:34 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-21 15:35:34 +0200 |
| commit | ffdff07941620b6f1e9869772dd9a47b29639804 (patch) | |
| tree | 9b2b32da8263f6e98104fa16305f636cc8bdbcd5 /helper/fileutil.inc | |
| parent | Fix OpenSLX Banner (diff) | |
| download | tm-scripts-ffdff07941620b6f1e9869772dd9a47b29639804.tar.gz tm-scripts-ffdff07941620b6f1e9869772dd9a47b29639804.tar.xz tm-scripts-ffdff07941620b6f1e9869772dd9a47b29639804.zip | |
Refactoring:
REQUIRED_DEPENDENCIES -> REQUIRED_INSTALLED_PACKAGES
REQUIRED_PACKAGES -> REQUIRED_CONTENT_PACKAGES
Diffstat (limited to 'helper/fileutil.inc')
| -rw-r--r-- | helper/fileutil.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index 24b50a5f..de4bd409 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -45,9 +45,9 @@ tarcopy () { # get all files of required packages by a module list_packet_files() { - [ -z "$REQUIRED_PACKAGES" ] && pinfo "No required packages for $TOOL" && return 1 + [ -z "$REQUIRED_CONTENT_PACKAGES" ] && pinfo "No required packages for $TOOL" && return 1 local PACKAGE="" - for PACKAGE in $REQUIRED_PACKAGES; do + for PACKAGE in $REQUIRED_CONTENT_PACKAGES; do local OPTIONAL="$(echo "$PACKAGE" | cut -c 1)" [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" @@ -72,15 +72,15 @@ list_packet_files() { } # # install all dependencies of a module -# goes through all package as given in the variable REQUIRED_DEPENDENCIES +# goes through all package as given in the variable REQUIRED_INSTALLED_PACKAGES install_dependencies() { - [ -z "$REQUIRED_DEPENDENCIES" ] && return + [ -z "$REQUIRED_INSTALLED_PACKAGES" ] && return if [ "$PACKET_MANAGER" = "apt" ]; then # install package, only if not already installed, TODO fix me - #dpkg -l $(echo $(echo "$REQUIRED_DEPENDENCIES")) &> /dev/null && return - apt-get install -y $REQUIRED_DEPENDENCIES || perror "Could not apt-get install $REQUIRED_DEPENDENCIES" + #dpkg -l $(echo $(echo "$REQUIRED_INSTALLED_PACKAGES")) &> /dev/null && return + apt-get install -y $REQUIRED_INSTALLED_PACKAGES || perror "Could not apt-get install $REQUIRED_INSTALLED_PACKAGES" elif [ "$PACKET_MANAGER" = "zypper" ]; then - zypper --no-refresh install -y -n $REQUIRED_DEPENDENCIES || perror "Could not zypper install $REQUIRED_DEPENDENCIES" + zypper --no-refresh install -y -n $REQUIRED_INSTALLED_PACKAGES || perror "Could not zypper install $REQUIRED_INSTALLED_PACKAGES" fi } # |