forked from qo-op/G1BILLET
bug with killing old 33102
This commit is contained in:
parent
8b38684668
commit
82dea01a72
|
@ -22,7 +22,7 @@ MONTANT="$1"
|
|||
### COMMAND LINE MODE (DAEMON IS CALLING ITSELF) ###
|
||||
if [[ $MONTANT != "daemon" ]]; then
|
||||
|
||||
pidportinuse=$(lsof -i :33102 | head -n 1 | awk '{print $2}')
|
||||
pidportinuse=$(lsof -i :33102 | tail -n 1 | awk '{print $2}')
|
||||
[[ $pidportinuse ]] && kill $pidportinuse && echo "KILLING NOT COLLECTED THREAD $pidportinuse"
|
||||
|
||||
[[ $MONTANT == "" || $MONTANT == "0" ]] && MONTANT="___"
|
||||
|
|
|
@ -51,36 +51,39 @@ FULLDICE=${#TAB[@]}
|
|||
mkdir -p ${MY_PATH}/tmp/g1billet/$UNIQID
|
||||
BILLETNAME=$(echo ${SECRET1} | sed 's/ /_/g')
|
||||
|
||||
IMAGESSTYLE="${IMAGES}/${STYLE}"
|
||||
[[ ! -d ${MY_PATH}/${IMAGESSTYLE} ]] && IMAGESSTYLE="${IMAGES}/xastro" ## DEFAULT : TOOD CREATE UPlanet Style
|
||||
|
||||
# Prepare June logo color
|
||||
case "$MONTANT" in
|
||||
1)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill grey -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill grey -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
2)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill green -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill green -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
5)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill orange -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill orange -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
10)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill blue -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill blue -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
20)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill purple -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill purple -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
50)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill red -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill red -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
100)
|
||||
convert "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" -fuzz 20% -fill black -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
convert "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" -fuzz 20% -fill black -opaque '#17b317' "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
*)
|
||||
cp "${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
cp "${MY_PATH}/${IMAGESSTYLE}/fond.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg"
|
||||
;;
|
||||
esac
|
||||
|
||||
## UPPER RIGHT SIGN (g1.png)
|
||||
cp "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
|
||||
cp "${MY_PATH}/${IMAGESSTYLE}/g1.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
|
||||
|
||||
## ♥Box :: ZENCARD or ASTROID
|
||||
|
||||
|
@ -103,7 +106,7 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
|
|||
rm ${MY_PATH}/tmp/topgp ## CLEANING CACHE
|
||||
|
||||
DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )"
|
||||
[[ ${STYLE} == "UPlanet" ]] && DISCO="$(cat ~/.zen/tmp/${MOATS}/gpg.asc | tr '-' '&' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" ## & ẑencard = (email/8digit)+4digit ## CALLED FROM VISA.new
|
||||
[[ ${STYLE} == "UPlanet" ]] && DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '&' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" ## & ẑencard = (email/8digit)+4digit ## CALLED FROM VISA.new
|
||||
|
||||
echo "$DISCO"
|
||||
|
||||
|
@ -210,7 +213,7 @@ fi
|
|||
|
||||
# OVERLAY LOGO over FOND (logo.png)
|
||||
composite -compose Over -dissolve 70% \
|
||||
"${MY_PATH}/${IMAGES}/${STYLE}/logo.png" \
|
||||
"${MY_PATH}/${IMAGESSTYLE}/logo.png" \
|
||||
"${MY_PATH}/tmp/g1billet/${UNIQID}/fond.jpg" \
|
||||
"${MY_PATH}/tmp/${BILLETNAME}.jpg"
|
||||
|
||||
|
|
Loading…
Reference in New Issue