jina verze

sodew-bash-main/libs/main.sh

@@ -27,7 +27,7 @@ function numFormat() {
 # $2 (items): array elements to search in (passed as individual arguments).
 function arrayContains() {
     local needle="${1-}"
-    shift || true
+    shift
 
     local item
     for item in "$@"; do
@@ -113,64 +113,6 @@ function domainToUser() {
     printf '%s' "${base:0:21}-${hash}"
 }
 
-function domainToUid() {
-    local domain="${1-}"
-    local username uid
-
-    if [[ -z "$domain" ]]; then
-        appError "Domain not specified"
-        return 1
-    fi
-
-    username=$(domainToUser "$domain")
-    if [[ -z "$username" ]]; then
-        appError "Cannot compute username for: $domain"
-        return 1
-    fi
-
-    uid=$(id -u "$username" 2>/dev/null)
-    if [[ -z "$uid" ]]; then
-        appError "No such user: $username"
-        return 1
-    fi
-
-    if [[ "$uid" == "0" ]]; then
-        appError "Refusing to return root UID for: $domain"
-        return 1
-    fi
-
-    printf '%s' "$uid"
-}
-
-function domainToGid() {
-    local domain="${1-}"
-    local username gid
-
-    if [[ -z "$domain" ]]; then
-        appError "Domain not specified"
-        return 1
-    fi
-
-    username=$(domainToUser "$domain")
-    if [[ -z "$username" ]]; then
-        appError "Cannot compute username for: $domain"
-        return 1
-    fi
-
-    gid=$(id -g "$username" 2>/dev/null)
-    if [[ -z "$gid" ]]; then
-        appError "No such user: $username"
-        return 1
-    fi
-
-    if [[ "$gid" == "0" ]]; then
-        appError "Refusing to return root GID for: $domain"
-        return 1
-    fi
-
-    printf '%s' "$gid"
-}
-
 # Generate random string from domain
 function domainToRandom() {
     local domain="${1-}"
@@ -216,7 +158,7 @@ function run() {
 # Run command, discard stdout
 function runError() {
     local -n __runErrorErr="$1"
-    shift || true
+    shift
 
     local __runErrorOutput __runErrorError status
     run __runErrorOutput __runErrorError "$@"