rapport d'activités: correction du format (textile)
ne pas barrer le texte "instance mineclone2"
This commit is contained in:
parent
baa09328c4
commit
3c40a12635
@ -91,7 +91,7 @@ elif [ "$#" = 1 ] && [ "$1" = "-p" ]; then
|
|||||||
month="$year$precedingMonth"
|
month="$year$precedingMonth"
|
||||||
fi
|
fi
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date -d $year-$precedingMonth-01 +%b)
|
monthEnglish=$(LANG=en_EN.UTF-8;date -d $year-$precedingMonth-01 +%b)
|
||||||
echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $monthEnglish $year"
|
echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $monthEnglish $year"
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
generateReport "$monthEnglish" "$month" "$year"
|
||||||
elif [ "$#" -eq 2 ]; then
|
elif [ "$#" -eq 2 ]; then
|
||||||
if ! (let "$1") 2>/dev/null; then
|
if ! (let "$1") 2>/dev/null; then
|
||||||
@ -117,14 +117,14 @@ elif [ "$#" -eq 2 ]; then
|
|||||||
fi
|
fi
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date -d "$2-$1-01" +%b)
|
monthEnglish=$(LANG=en_EN.UTF-8;date -d "$2-$1-01" +%b)
|
||||||
year="$2"
|
year="$2"
|
||||||
echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $monthEnglish $2"
|
echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $monthEnglish $2"
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
generateReport "$monthEnglish" "$month" "$year"
|
||||||
fi
|
fi
|
||||||
elif [ "$#" -eq 0 ]; then
|
elif [ "$#" -eq 0 ]; then
|
||||||
month="$(date +%Y%m)"
|
month="$(date +%Y%m)"
|
||||||
monthEnglish=$(LANG=en_EN.UTF-8;date +%b)
|
monthEnglish=$(LANG=en_EN.UTF-8;date +%b)
|
||||||
year="$(date +%Y)"
|
year="$(date +%Y)"
|
||||||
echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $(date +%b) 20$(date +%y)"
|
echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $(date +%b) 20$(date +%y)"
|
||||||
generateReport "$monthEnglish" "$month" "$year"
|
generateReport "$monthEnglish" "$month" "$year"
|
||||||
else
|
else
|
||||||
echo -e "Bad parameter."
|
echo -e "Bad parameter."
|
||||||
|
Loading…
Reference in New Issue
Block a user