adaptation to trixie and excalibur

history.txt

@@ -7,6 +7,17 @@ Current version from Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 ------------------------------------------------------------------------------
 Version history:
 ------------------------------------------------------------------------------
+
+# 24/02/2022 v3.3.1
+	Fixed version detection
+	Added "busy" function
+	Fixed use of library functions before it's loaded
+
+# 28/11/2022 v3.3.0
+	Initial version update support
+	Changed versioning code
+	Added installation path detection
+
 # 28/11/2022 v3.2.3
 	Made proper readme file, to improve
 

profile.d/compress.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -34,7 +35,7 @@
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# Smartly uncompress archives (zip only)
+# Smartly uncompress archives (zip only for now)
 # ------------------------------------------------------------------------------
 utaz()
 {
@@ -80,28 +81,32 @@ utaz()
         esac
     done
 
-    [[ $createdir && $nodir ]] && disp E "The --create-dir and --no-dir options are mutually exclusive."
+    [[ $createdir && $nodir ]] && \
+        disp E "The --create-dir and --no-dir options are mutually exclusive."
 
     [[ ! $LIST ]] && local LIST="."
 
     for zitem in $LIST; do
-        [[ $(ls $zitem/*.zip 2> /dev/null | wc -l) -eq 0 ]] &&
-            disp W "$zitem contains no supported archive file, skipping." &&
+        shopt -s nullglob
+        local zips=("$zitem"/*.zip)
+        shopt -u nullglob
+        [[ ${#zips[@]} -eq 0 ]] && \
+            disp W "$zitem contains no supported archive file, skipping." && \
             continue
 
-        for f in $zitem/*.zip; do
-            disp I "Processing archive $zitem/$f... "
+        for f in "$zitem"/*.zip; do
+            disp I "Processing archive $f... "
             local dir=${f::-4}
 
-            mkdir -p $dir
+            mkdir -p "$dir"
             [[ $? -gt 0 ]] &&
                 disp E "The filesystem can't create directories, exit!" &&
                 return 1
 
-            unzip -o $f -d $dir > /dev/null 2>&1
+            unzip -o "$f" -d "$dir" >/dev/null 2>&1
             case $? in
             0)
-                    [[ $willrm ]] && rm -f $f && disp I "File $zitem/$f deleted."
+                [[ $willrm ]] && rm -f "$f" && disp I "File $zitem/$f deleted."
                 ;;
 
             1)
@@ -109,7 +114,7 @@ utaz()
                 ;;
             *)
                 disp E "The zip file seems corrupted, failed."
-                    rm -rf $dir > /dev/null 2>&1
+                rm -rf "$dir" >/dev/null 2>&1
                 continue
                 ;;
             esac
@@ -117,7 +122,7 @@ utaz()
             if [[ $createdir ]]; then
                 disp I "Archive extracted successfully in subdirectory."
             elif [[ $nodir ]]; then
-                mv ./$dir/* ./ && rmdir $dir
+                mv "./$dir/"* ./ && rmdir "$dir"
                 disp I "Archive extracted successfully, no subdirectory needed."
             else
                 subdirs=$(find $dir -maxdepth 1 | wc -l)
@@ -166,11 +171,11 @@ taz ()
                 disp E "Program 'plzip' or 'lzip' are not installed, aborting."
                 return 127
             }
-            local command=lzip
+            command=lzip
             local procopt=""
             [[ $2 -gt 1 ]] &&
                 disp W "lzip doesn't support multithreading, falling back to 1 thread." &&
-                disp W "Consitder installing plzip to obtain multithreading abilities."
+                disp W "Consider installing plzip to obtain multithreading abilities."
         }
 
         [[ $4 ]] && local verb="-vv"
@@ -194,7 +199,7 @@ taz ()
             local procopt=""
             [[ $2 -gt 1 ]] &&
                 disp W "gzip doesn't support multithreading, falling back to 1 thread." &&
-                disp W "Consitder installing pigz to obtain multithreading abilities."
+                disp W "Consider installing pigz to obtain multithreading abilities."
         }
 
         [[ $4 ]] && local verb="--verbose"
@@ -218,7 +223,7 @@ taz ()
             local procopt=""
             [[ $2 -gt 1 ]] &&
                 disp W "bzip2 doesn't support multithreading, falling back to 1 thread." &&
-                disp W "Consitder installing pbzip2 to obtain multithreading abilities."
+                disp W "Consider installing pbzip2 to obtain multithreading abilities."
         }
 
         [[ $4 ]] && local verb="-v"
@@ -290,7 +295,7 @@ taz ()
             ;;
 
         "-q" | "--quiet")
-		QUIET=1
+            local quiet=1
             ;;
 
         "-"*)
@@ -311,17 +316,17 @@ taz ()
     [[ ! $compform ]] && compform=lz # safe and efficient (unless data are already compressed)
     [[ ! $nproc ]] && nproc=1
     [[ ! $complevel ]] && complevel=6
-    [[ $verbose -gt 1 && $QUIET -gt 1 ]] &&
+    [[ $verbose -gt 1 && $quiet -gt 1 ]] &&
         disp E "The --verbose and --quiet options can't be used together."
 
     for item in $LIST; do
         local donetar=0
         disp I "Processing $item..."
 
-        if [[ -d $item ]]; then
+        if [[ -d "$item" ]]; then
             disp I "\t Creating $item.tar... "
 
-            tar -cf $item{.tar,}
+            tar -cf "$item.tar" "$item"
             if [[ ! $? -eq 0 ]]; then
                 disp E "tar file creation failed, skipping to next item."
                 continue
@@ -336,7 +341,7 @@ taz ()
         # Skip compression part if tar is asked
         if [[ $compform != "tar" ]]; then
             disp I "\t Compressing archive..."
-            _do$compform $fname $nproc $complevel $verbose
+            _do$compform "$fname" "$nproc" "$complevel" "$verbose"
             [[ ! $? -eq 0 ]] && case $? in
             127)
                 disp E "Compression program unavailable, aborting."
@@ -348,14 +353,17 @@ taz ()
                 ;;
             esac
 
-            [[ $donetar -gt 0 ]] && rm $fname
+            [[ $donetar -gt 0 ]] && rm "$fname"
         fi
 
         if [[ $willrm ]]; then
             disp I "\t Deleting original source as asked... "
-            rm -r $item
+            rm -r "$item"
         fi
     done
-    unset QUIET
+    unset quiet
 }
 export -f taz
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/debug.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -63,7 +64,6 @@ function error ()
     return $errcode
 }
 
-
 # ------------------------------------------------------------------------------
 # Activate or deactivate error trapping to display backtrace
 # ------------------------------------------------------------------------------
@@ -105,3 +105,6 @@ settrace ()
     unset status
 }
 export -f settrace
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/disp.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -40,6 +41,7 @@
 export DEFAULTFG="\e[0;39m"
 export DEFAULTBG="\e[0;49m"
 export DEFAULTCOL=${DEFAULTBG}${DEFAULTFG}
+export RESETCOL=$'\e[0m'
 
 # Regular Colors
 export Black='\e[0;30m'
@@ -111,7 +113,6 @@ export On_IPurple='\e[0;105m'
 export On_ICyan='\e[0;106m'
 export On_IWhite='\e[0;107m'
 
-
 # ------------------------------------------------------------------------------
 # Display a message
 # ------------------------------------------------------------------------------
@@ -121,28 +122,31 @@ disp()
     "I")
         local heads="[ ${IGreen}info${DEFAULTFG} ]"
         shift
-            [[ -z $QUIET || $QUIET -ne 1 ]] && echo -e "${heads} $@"
+        [[ -z $QUIET || $QUIET -ne 1 ]] && \
+            printf "%b\n" "${heads} $*${RESETCOL}"
         ;;
     "W")
         local heads="[ ${IYellow}Warning${DEFAULTFG} ]"
         shift
-            echo -e "${heads} $@" >&2
+        printf "%b\n" "${heads} $*${RESETCOL}" >&2
         ;;
     "E")
         local heads="[ ${IRed}ERROR${DEFAULTFG} ]"
         shift
-            echo -e "${heads} $@" >&2
+        printf "%b\n" "${heads} $*${RESETCOL}" >&2
         ;;
     "D")
-	    local heads"[ ${ICyan}debug${DEFAULTFG} ]"
+        local heads="[ ${ICyan}debug${DEFAULTFG} ]"
         shift
-	    [[ -n $DEBUG && $DEBUG -gt 1 ]] && echo -e "${heads} $@"
+        [[ -n $DEBUG && $DEBUG -gt 1 ]] && \
+            printf "%b\n" "${heads} $*${RESETCOL}"
         ;;
-        "*")
-            local heads=""
-            [[ -z $QUIET || $QUIET -ne 1 ]] && echo -e "$@"
+    * )
+        [[ -z $QUIET || $QUIET -ne 1 ]] && \
+            printf "%b\n" "$*"
         ;;
     esac
-    unset heads
 }
 export -f disp
+# ------------------------------------------------------------------------------
+# EOF

profile.d/filefct.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -47,7 +48,6 @@ expandlist()
     echo $result
 }
 
-
 # ------------------------------------------------------------------------------
 # Clean a directory or a tree from temporary or backup files
 # ------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ clean ()
     unset recursive force
 
     for dir in $dirlist; do
-        local dellist=$(find $dir $findopt -type f -name "*~" -o -name "#*#" \
+        local dellist=$(find "$dir" $findopt -type f -name "*~" -o -name "#*#" \
             -o -name "*.bak" -o -name ".~*#")
         for f in $dellist; do
             if [[ ! $outshell ]]; then
@@ -114,7 +114,6 @@ clean ()
 }
 export -f clean
 
-
 # ------------------------------------------------------------------------------
 # Create a directory then goes inside
 # ------------------------------------------------------------------------------
@@ -125,11 +124,10 @@ mcd ()
         disp E "Usage: mcd <directory>"
         return 1
     fi
-    mkdir -pv $1 && cd $1
+    mkdir -pv "$1" && cd "$1" || echo "Failed create or change directory."
 }
 export -f mcd
 
-
 # ------------------------------------------------------------------------------
 # Rename all files in current directory to replace spaces with _
 # ------------------------------------------------------------------------------
@@ -212,3 +210,134 @@ rmspc ()
     unset lst substchar verb shell newf command mvopt
 }
 export -f rmspc
+
+
+# ------------------------------------------------------------------------------
+# display stats about a file structure
+# ------------------------------------------------------------------------------
+file_stats()
+{
+    local human=0 details=0 only_avg=0 only_med=0 only_count=0 only_total=0
+    local path="." show_all=1 ext_filter="" ext_list="" min_size="" max_size=""
+    local OPTIND opt
+
+    # Analyse options
+    while [[ "$1" =~ ^- ]]; do
+        case "$1" in
+            -H) human=1 ;;
+            -d) details=1 ;;
+            -m) only_avg=1; show_all=0 ;;
+            -M) only_med=1; show_all=0 ;;
+            -c) only_count=1; show_all=0 ;;
+            -t) only_total=1; show_all=0 ;;
+            -a) human=1; details=1 ;;
+            -x) ext_filter="${2#.}"; shift ;;
+            -X) ext_list="${2}"; shift ;;
+            --min) min_size="$2"; shift ;;
+            --max) max_size="$2"; shift ;;
+            --) shift; break ;;
+            -*) echo "Usage: file_stats [-h] [-d] [-mMctaxX --min N --max N] [path]"; return 1 ;;
+        esac
+        shift
+    done
+
+    [ -n "$1" ] && path="$1"
+
+    # Prepare find filters
+    local find_cmd=(find "$path" -type f)
+
+    # Extension simple
+    if [[ -n "$ext_filter" ]]; then
+        find_cmd+=(-iname "*.$ext_filter")
+    fi
+
+    # Extension liste
+    if [[ -n "$ext_list" ]]; then
+        IFS=',' read -ra exts <<< "$ext_list"
+        find_cmd+=('(')
+        for i in "${!exts[@]}"; do
+            [[ $i -ne 0 ]] && find_cmd+=(-o)
+            find_cmd+=(-iname "*.${exts[$i]}")
+        done
+        find_cmd+=(')')
+    fi
+
+    # Taille min/max (à évaluer en octets)
+    if [[ -n "$min_size" ]]; then
+        find_cmd+=(-size +"$(numfmt --from=iec "$min_size")"c)
+    fi
+    if [[ -n "$max_size" ]]; then
+        find_cmd+=(-size -"$(( $(numfmt --from=iec "$max_size") + 1 ))"c)
+    fi
+
+    # Exécution
+    "${find_cmd[@]}" -printf "%s\n" 2>/dev/null | sort -n | awk -v human="$human" -v details="$details" -v only_avg="$only_avg" -v only_med="$only_med" -v only_count="$only_count" -v only_total="$only_total" -v show_all="$show_all" -v path="$path" '
+    function human_readable(x) {
+        split("B KiB MiB GiB TiB", units)
+        for (i=1; x>=1024 && i<5; i++) x /= 1024
+        return sprintf("%.2f %s", x, units[i])
+    }
+    {
+        sizes[NR] = $1
+        total += $1
+        if (min == "" || $1 < min) min = $1
+        if (max == "" || $1 > max) max = $1
+        if ($1 == 0) bucket[0]++
+        else {
+            b = int(log($1)/log(1024))
+            bucket[b]++
+        }
+    }
+    END {
+        count = NR
+        if (count == 0) {
+            print "Aucun fichier trouvé."; exit
+        }
+
+        moyenne = total / count
+        if (count % 2 == 1)
+            mediane = sizes[(count + 1) / 2]
+        else
+            mediane = (sizes[count / 2] + sizes[count / 2 + 1]) / 2
+
+        function out(label, val) {
+            if (human) val = human_readable(val)
+            printf "%-20s : %s\n", label, val
+        }
+
+        if (only_avg)      out("Taille moyenne", moyenne)
+        else if (only_med) out("Taille médiane", mediane)
+        else if (only_count) printf "Nombre de fichiers     : %d\n", count
+        else if (only_total) out("Taille totale", total)
+        else {
+            if (show_all || human || details) {
+                printf "Statistiques sur \"%s\"\n", path
+                printf "-------------------------\n"
+            }
+            out("Nombre de fichiers", count)
+            out("Taille totale", total)
+            out("Taille moyenne", moyenne)
+            out("Taille médiane", mediane)
+            out("Taille minimale", min)
+            out("Taille maximale", max)
+        }
+
+        if (details) {
+            print "\nHistogramme des tailles :"
+            for (i = 0; i in bucket; i++) {
+                low = 2^i
+                high = 2^(i+1)
+                if (i == 0)
+                    label = sprintf("%4s – %4s", "0", "1K")
+                else
+                    label = sprintf("%4s – %4s", human_readable(low), human_readable(high))
+                printf "%-20s : %5d fichiers\n", label, bucket[i]
+            }
+        }
+    }'
+}
+# ------------------------------------------------------------------------------
+
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/fun.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+# Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
+# Protected by the BSD3 license. Please read bellow for details.
+#
+# * Redistribution and use in source and binary forms,
+# * with or without modification, are permitted provided
+# * that the following conditions are met:
+# *
+# *   Redistributions of source code must retain the above
+# *   copyright notice, this list of conditions and the
+# *   following disclaimer.
+# *
+# *   Redistributions in binary form must reproduce the above
+# *   copyright notice, this list of conditions and the following
+# *   disclaimer in the documentation and/or other materials
+# *   provided with the distribution.
+# *
+# *   Neither the name of the copyright holder nor the names
+# *   of any other contributors may be used to endorse or
+# *   promote products derived from this software without
+# *   specific prior written permission.
+# *
+# * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+# * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# * OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Make non-IT peoples think you're busy doing something hard
+# ------------------------------------------------------------------------------
+busy()
+{
+    local pattern="ca fe"
+    for arg in "$@"; do
+        case "$arg" in
+            --delay=*)
+                delay_ms="${arg#*=}"
+                if ! [[ $delay_ms =~ ^[0-9]+$ ]]; then
+                    disp E "Invalid delay value, must be an integer (milliseconds)."
+                    return 1
+                fi
+                ;;
+            *)
+                pattern="$arg"
+                ;;
+        esac
+    done
+
+    # Convert milliseconds to seconds for 'sleep'
+    local delay_s=$(awk "BEGIN { printf \"%.3f\", $delay_ms / 1000 }")
+
+    cat /dev/urandom | hexdump -C | grep --line-buffered "$pattern" | \
+        while read -r line; do
+        echo $line
+        [[ $delay_ms -gt 0 ]] && sleep "$delay_s"
+    done
+    unset pattern
+}
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/help.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -66,3 +67,5 @@ EOF
 }
 export -f help
 
+# ------------------------------------------------------------------------------
+# EOF

profile.d/info.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -38,26 +39,29 @@
 # ------------------------------------------------------------------------------
 ver()
 {
+    [[ -z $PROFVERSION ]] && \
+        disp W "No version defined. Profile is probably badly installed." && \
+        return 1
     disp "Profile version $PROFVERSION."
 }
 export -f ver
 
-
 # ------------------------------------------------------------------------------
 # Display weather of the given city (or default one)
 # ------------------------------------------------------------------------------
 meteo()
 {
-    cities=$@
-    [[ $# -eq 0 ]] && local cities=$DEFAULT_CITY
+    local encoded cities=("$@")
+    [[ $# -eq 0 ]] && cities=("$DEFAULT_CITY")
 
-    for city in $cities; do
-        curl https://wttr.in/$city || disp E "Failed fetching datas for $city."
+    for city in "${cities[@]}"; do
+        encoded=$(urlencode "$city")
+        curl -s "https://wttr.in/$encoded" || \
+            disp E "Failed fetching datas for $city."
     done
 }
 export -f meteo
 
-
 # ------------------------------------------------------------------------------
 # Display system general information
 # ------------------------------------------------------------------------------
@@ -68,23 +72,33 @@ showinfo()
         if [[ -s /usr/share/figlet/ansi_shadow.flf ]]; then
             local figopt="-f ansi_shadow"
         fi
-	figlet -k $(hostname) $figopt
+        if [[ -n $figopt ]]; then
+            figlet -k $figopt $(hostname)
         else
-	echo "$(hostname -f)"
+            figlet $(hostname)
+        fi
+    else
+        hostname -f
     fi
     echo ""
     if command -v neofetch >/dev/null 2>&1; then
         neofetch
+    elif command -v fastfetch >/dev/null 2>&1; then
+        fastfetch
     else
         (
             if [[ -s /etc/os-release ]]; then
+                # shellcheck disable=SC1091
                 . /etc/os-release
                 echo "$NAME $VERSION"
             else
                 cat /proc/version
             fi
-	    echo "Uptime: $(uptime)"
+            echo "Uptime: $(uptime -p)"
         )
     fi
 }
 export -f showinfo
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/lang.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -33,38 +34,69 @@
 # * OF SUCH DAMAGE.
 # ------------------------------------------------------------------------------
 
+locale_check() {
+    locale -a | grep -qx "$1" || {
+        disp W "Locale '$1' is not installed on this system."
+        return 1
+    }
+    return 0
+}
+
+
+# ------------------------------------------------------------------------------
+# Change locale to the given one in parameter
+# ------------------------------------------------------------------------------
+setlocale()
+{
+    local loc=$1
+    [[ -z $loc ]] && disp E "No locale specified." && return 1
+
+    locale_check "$loc" || return 1
+
+    export LANG=$loc
+    export LC_MESSAGES=$loc
+    export LC_TIME=$loc
+    export LC_NUMERIC=$loc
+    export LC_MONETARY=$loc
+    export LC_COLLATE=$loc
+    export LC_CTYPE=$loc
+
+    disp I "Locale set to $loc."
+}
+export -f setlocale
+
+
+# ------------------------------------------------------------------------------
+# Special case : change locale to C standard
+# ------------------------------------------------------------------------------
+setc()
+{
+    # Locale definitions
+    export LC_ALL=C
+    disp I "Locale changed to standard C (POSIX)."
+}
+export -f setc
+
+
 # ------------------------------------------------------------------------------
 # Change locale to French
 # ------------------------------------------------------------------------------
 setfr()
 {
     # Set fr locale definitions
-    export LANG=fr_FR.UTF-8
-    export LC_MESSAGES=fr_FR.UTF-8
-    export LC_ALL=fr_FR.UTF-8
+    setlocale "fr_FR.UTF-8"
 }
 export -f setfr
 
-# ------------------------------------------------------------------------------
-# Change locale to C standard
-# ------------------------------------------------------------------------------
-setc ()
-{
-    # Locale definitions
-    export LANG=C
-    export LC_MESSAGES=C
-    export LC_ALL=C
-}
-export -f setc
 
 # ------------------------------------------------------------------------------
 # Change locale to US (needed by Steam)
 # ------------------------------------------------------------------------------
 setus()
 {
-    # Locale definitions
-    export LANG=en_US.UTF-8
-    export LC_MESSAGES=en_US.UTF-8
-    export LC_ALL=en_US.UTF-8
+    setlocale "en_US.UTF-8"
 }
 export -f setus
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/net.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -40,6 +41,7 @@ isipv4 ()
 {
     # Set up local variables
     local ip=$1
+    [[ -z $ip ]] && return 1
 
     # Start with a regex format test
     if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
@@ -47,8 +49,8 @@ isipv4 ()
         IFS="."
         ip=($ip)
         IFS=$old_ifs
-	if [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
-		  && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]; then
+        if [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 &&
+            ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]; then
             if [[ -t 1 ]]; then
                 disp "The given IPv4 is valid."
             fi
@@ -62,7 +64,6 @@ isipv4 ()
 }
 export -f isipv4
 
-
 # ------------------------------------------------------------------------------
 # Determine if parameter is a valid IPv4 address
 # ------------------------------------------------------------------------------
@@ -82,3 +83,25 @@ isipv6 ()
     return 1
 }
 export -f isipv6
+
+# ------------------------------------------------------------------------------
+# Encode a string so it can be used as a URL parameter
+# ------------------------------------------------------------------------------
+urlencode() {
+    local LANG=C
+    local str="$*"
+    local length="${#str}"
+    for (( i = 0; i < length; i++ )); do
+        local c="${str:i:1}"
+        case "$c" in
+            [a-zA-Z0-9.~_-]) printf "$c" ;;
+            ' ') printf '+' ;;
+            *) printf '%%%02X' "'$c" #| cut -d' ' -f2 ;;
+        esac
+    done
+}
+export -f urlencode
+
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/packages.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -36,7 +37,7 @@
 # ------------------------------------------------------------------------------
 # Look for a package within installed one
 # ------------------------------------------------------------------------------
-dpkgs ()
+pkgs()
 {
     local count=0
     for opt in $@; do
@@ -68,13 +69,15 @@ dpkgs ()
         disp E "Please specify a package name, without space, eventually partial." &&
         return 1
 
-    if [[ $(command -v dpkg >/dev/null 2>&1) ]]; then
-	dpkg -l | grep $pkg
-    elif [[ $(command -v rpm >/dev/null 2>&1) ]]; then
-	rpm -qa | grep $pkg
-    else
+    command -v dpkg >/dev/null 2>&1 && local cmd="dpkg -l"
+    command -v rpm >/dev/null 2>&1 && local cmd="rpm -qa"
+    if [[ -z $cmd ]]; then
         disp E "No usable package manager seems unavialable."
         return 2
     fi
+    $cmd | grep $pkg
 }
-export -f dpkgs
+export -f pkgs
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/processes.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -38,11 +39,10 @@
 # ------------------------------------------------------------------------------
 ppg()
 {
-    ps -edf | grep $@ | grep -v "grep $@"
+    ps -edf | grep "$@" | grep -v "grep $@"
 }
 export -f ppg
 
-
 # ------------------------------------------------------------------------------
 # Get PID list of the given process name
 # ------------------------------------------------------------------------------
@@ -62,14 +62,33 @@ gpid ()
 }
 export -f gpid
 
-
 # ------------------------------------------------------------------------------
 # Kill all processes owned by the given users
 # ------------------------------------------------------------------------------
 ku()
 {
     for u in $@; do
-        killall -u $u
+        killall -u "$u"
     done
 }
 export -f ku
+
+# ------------------------------------------------------------------------------
+# Kill all children of a process then the process
+# ------------------------------------------------------------------------------
+kt()
+{
+    [[ -z $1 ]] && echo -e "Usage:\n\tkt <pid> [kill_options]"
+
+    local parent_pid="$1"
+    shift
+    children_pids=$(pgrep -P "$parent_pid")
+
+    for pid in $children_pids; do
+        kt "$pid" "$@"
+    done
+    kill "$@" "$parent_pid"
+}
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/prompt.sh

@@ -38,7 +38,7 @@
 # ------------------------------------------------------------------------------
 function timer_now
 {
-    date +%s%N
+    date +%s%N 2>/dev/null || date +%s
 }
 
 function timer_start
@@ -78,19 +78,19 @@ function timer_stop
 # ------------------------------------------------------------------------------
 set_prompt()
 {
-    Last_Command=$? # Must come first!
-    Blue='\[\e[0;34m\]'
-    White='\[\e[01;37m\]'
-    Yellow='\[\e[01;93m\]'
-    Red='\[\e[01;31m\]'
-    Green='\[\e[01;32m\]'
-    OnGrey='\[\e[47m\]'
-    OnRed='\[\e[41m\]'
-    OnBlue='\[\e[44m\]'
-    ICyan='\[\e[0;96m\]'
-    Default='\[\e[00m\]'
-    FancyX='\342\234\227'
-    Checkmark='\342\234\223'
+    local Last_Command=$? # Must come first!
+    local Blue='\[\e[0;34m\]'
+    local White='\[\e[01;37m\]'
+    local Yellow='\[\e[01;93m\]'
+    local Red='\[\e[01;31m\]'
+    local Green='\[\e[01;32m\]'
+    local OnGrey='\[\e[47m\]'
+    local OnRed='\[\e[41m\]'
+    local OnBlue='\[\e[44m\]'
+    local ICyan='\[\e[0;96m\]'
+    local Default='\[\e[00m\]'
+    local FancyX='\342\234\227'
+    local Checkmark='\342\234\223'
 
     # Begin with time
     PS1="\[\e[s$Blue$OnGrey [ \t ] $OnBlue"
@@ -123,3 +123,6 @@ set_prompt ()
     # the text color to the default.
     PS1+="$ICyan\\w \\\$$Default "
 }
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/pwd.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -44,6 +45,7 @@ genpwd()
     local occurs=2 # Bug, if set to 1, seems to be ignored
     local symb=1 maj=1 min=1 numb=1
     local nbpwd=1
+    local extcar
 
     for opt in $@; do
         case $opt in
@@ -88,7 +90,7 @@ genpwd()
             min=0
             ;;
         "-e"?* | "--extracars"?*)
-		local extcar=$(echo "$opt" | cut -f 2- -d '=')
+            extcar=$(echo "$opt" | cut -f 2- -d '=')
             ;;
         "-L"?* | "--length"?*)
             local length=$(echo "$opt" | cut -f 2- -d '=')
@@ -113,19 +115,18 @@ genpwd()
                 disp E "Unknow parameter ${opt}."
                 return 1
             else
-		    local nbpwd=$opt
+                nbpwd=$opt
             fi
             ;;
         esac
     done
 
     # Function selecting a random caracter from the list in parameter
-    pickcar()
-    {
+    pickcar() {
         # When a character is picked we check if it's not appearing already twice
         # elsewhere, we choose an other char, to compensate weak bash randomizer
         while [[ -z $char ]]; do
-	    local char=$(echo ${1:RANDOM%${#1}:1} $RANDOM)
+            local char="${1:RANDOM%${#1}:1} $RANDOM"
             if [[ $(awk -F"$char" '{print NF-1}' <<<"$picked") -gt $occurs ]]; then
                 unset char
             fi
@@ -184,3 +185,6 @@ genpwd()
     done
 }
 export -f genpwd
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/rain.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -54,7 +55,6 @@ rain()
     local X=0 Y=0 drop_length=0 rain_drop=0
     local max_rain_width=0 new_rain_odd=0 falling_odd=0
 
-
     sigwinch() {
         term_width=$(tput cols)
         term_height=$(tput lines)
@@ -152,3 +152,6 @@ rain()
     trap - WINCH
 }
 export -f rain
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/ssh.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # ------------------------------------------------------------------------------
 # Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
 # Protected by the BSD3 license. Please read bellow for details.
@@ -46,9 +47,9 @@ rmhost ()
 
     while [[ $1 ]]; do
         local hst=$1 && shift
-	isipv4 $hst > /dev/null
+        isipv4 "$hst" >/dev/null
         local v4=$?
-	isipv6 $hst > /dev/null
+        isipv6 "$hst" >/dev/null
         local v6=$?
 
         if [[ $v4 -eq 0 || $v6 -eq 0 ]]; then
@@ -58,11 +59,15 @@ rmhost ()
         unset v4 v6
 
         if [[ ! $ip && $hst ]]; then
-	    ip=$(host $hst | grep "has address" | awk '{print $NF}')
-	    [[ ! $? ]] &&
+            if ! ip=$(host "$hst" 2>/dev/null | awk '/has address/ {print $NF; exit}'); then
                 disp E "Impossible to extract IP from hostname." &&
                 return 1
             fi
+            [[ -z $ip ]] && {
+                disp E "Impossible to extract IP from hostname."
+                return 1;
+            }
+        fi
 
         if [[ $hst ]]; then
             disp I "Removing host $hst from ssh known_host..."
@@ -77,7 +82,6 @@ rmhost ()
 }
 export -f rmhost
 
-
 # ------------------------------------------------------------------------------
 # Login root via SSH on the given machine
 # ------------------------------------------------------------------------------
@@ -94,12 +98,19 @@ ssr ()
         esac
     done
 
+    command -v ssh >/dev/null 2>&1 || {
+        disp E "ssh is not installed."
+        return 127
+    }
     [[ ! $1 ]] &&
         disp E "Please specify the server you want to log in." &&
         return 1
 
     local srv=$1 && shift
 
-    ssh -Y root@$srv $@
+    ssh -Y root@"$srv" "$@"
 }
 export -f ssr
+
+# ------------------------------------------------------------------------------
+# EOF

profile.d/updates.sh

@@ -0,0 +1,135 @@
+#!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+# Copyright (c) 2013-2022 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
+# Protected by the BSD3 license. Please read bellow for details.
+#
+# * Redistribution and use in source and binary forms,
+# * with or without modification, are permitted provided
+# * that the following conditions are met:
+# *
+# *   Redistributions of source code must retain the above
+# *   copyright notice, this list of conditions and the
+# *   following disclaimer.
+# *
+# *   Redistributions in binary form must reproduce the above
+# *   copyright notice, this list of conditions and the following
+# *   disclaimer in the documentation and/or other materials
+# *   provided with the distribution.
+# *
+# *   Neither the name of the copyright holder nor the names
+# *   of any other contributors may be used to endorse or
+# *   promote products derived from this software without
+# *   specific prior written permission.
+# *
+# * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+# * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# * OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+
+export BASE_URL="https://git.geoffray-levasseur.org/fatalerrors/profile"
+export UPDT_URL="$BASE_URL/raw/branch/master"
+export ARCH_URL="$BASE_URL/archive/master.tar.gz"
+
+# ------------------------------------------------------------------------------
+# Check for profile updates
+# ------------------------------------------------------------------------------
+check_updates()
+{
+    if [[ $1 == "-q" ]]; then
+        # Quiet mode is mostly used internally when profile_upgrade is called
+        quiet=1
+    fi
+    disp I "Checking for updates..."
+    local vfile="/tmp/version"
+    wget "$UPDT_URL/version" -O $vfile >/dev/null 2>&1 || {
+        disp E "Can't download version file, impossible to proceed!"
+        return 5
+    }
+
+    if [[ -s $vfile ]]; then
+        local lastver=$(cat $vfile)
+        if [[ $lastver != $PROFVERSION ]]; then
+            disp I "You have version $PROFVERSION installed. Version $lastver is available."
+            [[ $quiet ]] && disp I "You should upgrade to last version when possible."
+            result=1
+        else
+            disp I "Your version is up-to-date."
+            result=0
+        fi
+        rm -f $vfile
+    else
+        disp E "Impossible to read temporary file, impossible to proceed."
+    fi
+    unset lastver vfile
+    return $result
+}
+
+# ------------------------------------------------------------------------------
+# Apply update to profile
+# ------------------------------------------------------------------------------
+profile_upgrade()
+{
+    check_updates -q
+    local need_update=$?
+    [[ $need_update -ne 1 ]] && {
+        disp "No update available."
+        return 0
+    }
+
+    if [[ -s $MYPATH/profile.sh ]]; then
+        disp E "Installation path detection failed, cannot upgrade automatically."
+        return 1
+    fi
+
+    if [[ -d $MYPATH/.git ]]; then
+        disp I "Git installation detected, applying git pull."
+        local curdir=$(pwd)
+        cd $MYPATH
+        git pull || {
+            disp E "Git pull failed, upgrade not applyed."
+            cd "$curdir"
+            return 2
+        }
+        disp I "Successfully upgraded using git."
+        cd "$curdir"
+    else
+        disp I "No Git detected. Downloading and applying upgrade from archive..."
+        local tmpdir="/tmp/profile_upg.$$"
+        mkdir -p "$tmpdir" || {
+            disp E "Failed to create temporary directory."
+            return 4
+        }
+
+        local archive="$tmpdir/profile.tar.gz"
+        wget -q "$ARCH_URL" -O "$archive" || {
+            disp E "Failed to download archive."
+            rm -rf "$tmpdir"
+            return 5
+        }
+
+        tar -xzf "$archive" -C "$tmpdir" || {
+            disp E "Archive extraction failed."
+            rm -rf "$tmpdir"
+            return 6
+        }
+
+        disp I "Installing new version..."
+        cp -r "$tmpdir"/profile/* "$MYPATH"/ || {
+            disp E "Failed to copy new files to $MYPATH."
+            rm -rf "$tmpdir"
+            return 7
+        }
+
+        disp I "Upgrade complete. You should now logout and login again."
+        rm -rf "$tmpdir"
+    fi
+}
+# EOF

profile.sh

@@ -35,12 +35,8 @@
 # * OF SUCH DAMAGE.
 # ------------------------------------------------------------------------------
 
-export PROFVERSION="3.2.3"
-
-export DEFAULT_CITY="Toulouse"
-
-if [[ ! $(echo $SHELL | grep bash) ]]; then
-    echo "That environmet script is designed to be used with bash or zsh being the shell."
+if [[ ! $SHELL =~ bash|zsh ]]; then
+    echo "That environment script is designed to be used with bash or zsh being the shell."
     echo "Please consider using bash or zsh instead, or patch me ;)!"
     return 1
 fi
@@ -50,7 +46,7 @@ fi
 # ------------------------------------------------------------------------------
 pathremove()
 {
-    local ifs=':'
+    local IFS=':'
     local newpath
     local dir
     local pathvar=${2:-PATH}
@@ -76,13 +72,31 @@ pathappend ()
     export $pathvar="${!pathvar:+${!pathvar}:}$1"
 }
 
-
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # ********************************** MAIN PROGRAM ******************************
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 
+# Store script's path (realpath -s resolve symlinks if profile.sh is a symlink)
+if [[ -z "$PROFILE_PATH" ]]; then
+    export MYPATH=$(dirname "$(realpath -s "$0")")
+else
+    export MYPATH="$PROFILE_PATH"
+fi
+if [[ ! -e "$MYPATH/profile.sh" ]]; then
+    echo "[ Warning ] Path detection failed, trying to use pwd..."
+    MYPATH=$(pwd)
+    if [[ ! -e "$MYPATH/profile.sh" ]]; then
+        echo "[ Error ] Impossible to determine installation path, pretty much nothing will work."
+    fi
+fi
+
+if [[ ! -s "$MYPATH/version" ]]; then
+    echo "[ Warning ] Impossible to determine running version of profile, your installation might be broken."
+fi
+export PROFVERSION=$(cat "$MYPATH"/version)
+
 # Build PATH environment variable
 if [[ $EUID -eq 0 ]]; then
     pathappend /sbin:/usr/sbin
@@ -91,6 +105,10 @@ fi
 [[ -d ~/bin ]] && pathappend ~/bin
 [[ -d ~/.local/bin ]] && pathappend ~/.local/bin
 
+# ------------------------------------------------------------------------------
+# Default values are set here and will be overloaded with config file if any
+# ------------------------------------------------------------------------------
+
 # Set bash history
 export HISTSIZE=50000
 export HISTIGNORE="&:[bf]g:exit"
@@ -106,17 +124,22 @@ export CFLAGS="-O2 -pipe -march=native"
 export MAKEFLAGS='-j12'
 export PKGSOURCES='/share/src/archives'
 
+# Default city for weather forcast
+export DEFAULT_CITY="Toulouse"
 
 # ------------------------------------------------------------------------------
 # Default values could be altered after this line
 # ------------------------------------------------------------------------------
 
+# Load global configuration
+[[ -f $MYPATH/etc/profile.conf ]] && . $MYPATH/etc/profile.conf
+
 # Load personal configuration
 [[ -f ~/.profile.conf ]] && . ~/.profile.conf
 
-# Execute optionnal config script if any
-for script in ~/profile.d/*.sh ; do
-    if [ -r $script ] ; then
+# Load module scripts
+for script in $MYPATH/profile.d/*.sh; do
+    if [[ -r $script ]]; then
         . $script
     fi
 done
@@ -152,6 +175,7 @@ if [[ $INTERACTIVE ]]; then
     alias du='du -ch'
 
     alias sdu='du -sk ./* | sort -n'
+    alias hdu='du -hs ./* | sort -H'
 
     # Define PS1
     trap 'timer_start' DEBUG

version

@@ -0,0 +1 @@
+3.4.0