diff --git a/docs/scripts/getInfo.md b/docs/scripts/getInfo.md index 842dd73..286ce13 100644 --- a/docs/scripts/getInfo.md +++ b/docs/scripts/getInfo.md @@ -1,6 +1,6 @@ # getInfo -![version: 4.9.0](https://img.shields.io/badge/version-4.9.0-blue.svg?longCache=true&style=for-the-badge) +![version: 4.9.1](https://img.shields.io/badge/version-4.9.1-blue.svg?longCache=true&style=for-the-badge) ![bash langage](https://img.shields.io/badge/bash-4-brightgreen.svg?longCache=true&style=for-the-badge) ![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg?longCache=true&style=for-the-badge) diff --git a/docs/scripts/ipupdate.md b/docs/scripts/ipupdate.md index ebaa9d7..d69754e 100644 --- a/docs/scripts/ipupdate.md +++ b/docs/scripts/ipupdate.md @@ -1,8 +1,8 @@ # ipupdate -![version: 1.4.0](https://img.shields.io/badge/version-1.4.0-blue.svg?longCache=true&style=for-the-badge) -![bash langage](https://img.shields.io/badge/bash-version4-brightgreen.svg) -![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg) +![version: 1.4.1](https://img.shields.io/badge/version-1.4.1-blue.svg?longCache=true&style=for-the-badge) +![bash langage](https://img.shields.io/badge/bash-4-brightgreen.svg?longCache=true&style=for-the-badge) +![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg?longCache=true&style=for-the-badge) ## client DNS dynamique, ipv4, ipv6 diff --git a/docs/scripts/pastit.md b/docs/scripts/pastit.md index f491076..e7d4f04 100644 --- a/docs/scripts/pastit.md +++ b/docs/scripts/pastit.md @@ -1,8 +1,8 @@ # pastit -![version: 0.3.1](https://img.shields.io/badge/version-0.3.1-blue.svg?longCache=true&style=for-the-badge) -![bash langage](https://img.shields.io/badge/bash-version4-brightgreen.svg) -![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg) +![version: 0.4.0](https://img.shields.io/badge/version-0.4.0-blue.svg?longCache=true&style=for-the-badge) +![bash langage](https://img.shields.io/badge/bash-4-brightgreen.svg?longCache=true&style=for-the-badge) +![license LPRAB / WTFPL](https://img.shields.io/badge/license-LPRAB%20%2F%20WTFPL-blue.svg?longCache=true&style=for-the-badge) ## chargement et lancement du script: diff --git a/scripts/getInfo b/scripts/getInfo index e63e15c..4905538 100755 --- a/scripts/getInfo +++ b/scripts/getInfo @@ -5,7 +5,7 @@ # SC2016 Expressions don't expand in single quotes # SC2009 Consider using pgrep instead of grepping ps output -version=4.9.0 +version=4.9.1 date="20/06/2018" script="getInfo" contact="IRC freenode.net ##sdeb@freenode.net ou https://framagit.org/sdeb/getInfo/issues" @@ -4478,13 +4478,13 @@ fipaste_curl_markdownshare(){ # à tester/finir } # $1 file to paste, $2 language, [$3="debugPaste" afficher retour paste], requires $pasteDuration -fipaste_pastery(){ # 20/06/2018-2 +fipaste_pastery(){ # 20/06/2018-3 local title language="$2" pasted csv id pastebin='pastery.net' type -t f__info &>/dev/null && c_echo="f__info" || c_echo="echo -e" # f__info existe? sinon echo [ ! -e "$1" ] && c_echo "fichier $1 inexistant" type -t f__basedirname &>/dev/null && f__basedirname "$1" - basename=${basename:""} + [ -z "$basename" ] && basename="" [ "$basename" ] && title="$basename-${script}_$version" || title="${script}_$version" [ "$language" == 'auto' ] && language='autodetect' # un fichier simple curl https://www.pastery.net/api/paste/ -F file=@data.txt @@ -4492,7 +4492,7 @@ fipaste_pastery(){ # 20/06/2018-2 if [[ $pasted =~ \(.*5[0-9].*error.*)\ ]]; then $c_echo "$RED"" Erreur export sur $pastebin:$STD \\n ${BASH_REMATCH[1]}" elif [[ $pasted =~ \"result\":\ \"error ]]; then - $c_echo "$RED"" Erreur export sur $pastebin:$STD \\n $pasted" + $c_echo "$RED"" Erreur export sur $pastebin:$STD \\n $( file -b "$1" ) \\n $pasted" else IFS=', ' read -r -a csv <<< "$pasted" id=${csv[1]%\"}