From aca3e2c8b597e8fdd2f4d1a1ce6e95c0530d2122 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 19 Apr 2021 15:05:26 +0200 Subject: [PATCH] libstd: unused std::upvars() removed --- Pmodules/libstd.bash | 66 -------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash index be491b6..eb8525d 100644 --- a/Pmodules/libstd.bash +++ b/Pmodules/libstd.bash @@ -205,72 +205,6 @@ std::upvar() { fi } - -# Assign variables one scope above the caller -# Usage: local varname [varname ...] && -# upvars [-v varname value] | [-aN varname [value ...]] ... -# Available OPTIONS: -# -aN Assign next N values to varname as array -# -v Assign single value to varname -# Return: 1 if error occurs -# Example: -# -# f() { local a b; g a b; declare -p a b; } -# g() { -# local c=( foo bar ) -# local "$1" "$2" && upvars -v $1 A -a${#c[@]} $2 "${c[@]}" -# } -# f # Ok: a=A, b=(foo bar) -# -std::upvars() { - if ! (( $# )); then - echo "${FUNCNAME[0]}: usage: ${FUNCNAME[0]} [-v varname"\ - "value] | [-aN varname [value ...]] ..." 1>&2 - return 2 - fi - while (( $# )); do - case $1 in - -a*) - # Error checking - [[ ${1#-a} ]] || { echo "bash: ${FUNCNAME[0]}: \`$1': missing"\ - "number specifier" 1>&2; return 1; } - printf %d "${1#-a}" &> /dev/null || { echo "bash:"\ - "${FUNCNAME[0]}: \`$1': invalid number specifier" 1>&2 - return 1; } - # Assign array of -aN elements - [[ "$2" ]] && unset -v "$2" && eval $2=\(\"\${@:3:${1#-a}}\"\) && - shift $((${1#-a} + 2)) || { echo "bash: ${FUNCNAME[0]}:"\ - "\`$1${2+ }$2': missing argument(s)" 1>&2; return 1; } - ;; - -v) - # Assign single value - [[ "$2" ]] && unset -v "$2" && eval $2=\"\$3\" && - shift 3 || { echo "bash: ${FUNCNAME[0]}: $1: missing"\ - "argument(s)" 1>&2; return 1; } - ;; - --help) echo "\ -Usage: local varname [varname ...] && - ${FUNCNAME[0]} [-v varname value] | [-aN varname [value ...]] ... -Available OPTIONS: --aN VARNAME [value ...] assign next N values to varname as array --v VARNAME value assign single value to varname ---help display this help and exit ---version output version information and exit" - return 0 ;; - --version) echo "\ -${FUNCNAME[0]}-0.9.dev -Copyright (C) 2010 Freddy Vulto -License GPLv3+: GNU GPL version 3 or later -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law." - return 0 ;; - *) - echo "bash: ${FUNCNAME[0]}: $1: invalid option" 1>&2 - return 1 ;; - esac - done -} - std.get_os_release_linux() { local lsb_release=$(which lsb_release) local ID=''