Skip to content
Extraits de code Groupes Projets
Valider 1920f79a rédigé par salixor's avatar salixor Validation de Elliu
Parcourir les fichiers

Remove dep to python3 in favor of jq

parent ab5c0199
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!2Remove dep to python3 in favor of jq
......@@ -68,7 +68,7 @@ require() {
done
}
require \
md5sum mktemp column uuidgen convert montage identify python3 curl ffmpeg \
md5sum mktemp column uuidgen convert montage identify curl ffmpeg \
sed tr git sponge ls find jq chmod cat expr iconv bc
__grep=`which egrep`
if [ -z $__grep ]; then
......@@ -151,8 +151,7 @@ default_index() {
}
validate_token_internal() {
curl -s -X POST "https://$STPKG_HOMESERV/_matrix/media/r0/upload?access_token=$STPKG_TOKEN" | \
python3 -c "import sys, json; print(json.load(sys.stdin)['errcode'])" # TODO: Use jq here
curl -s -X POST "https://$STPKG_HOMESERV/_matrix/media/r0/upload?access_token=$STPKG_TOKEN" | jq -r ".errcode"
}
validate_token() {
......@@ -232,10 +231,9 @@ __upload_file() {
validate_token # Validate token, will exit if invalid
fi
# TODO: Use jq here
MXC=$(curl -s -X POST -H \
"Content-Type: $TYPE" --data-binary "@$FILE" "https://$STPKG_HOMESERV/_matrix/media/r0/upload?access_token=$STPKG_TOKEN" | \
tee /tmp/toto | python -c "import sys, json; print(json.load(sys.stdin)['content_uri'])")
tee /tmp/toto | jq -r ".content_uri")
[ $? -ne 0 ] && die "Failed to upload sticker $NAME for pack $PACK_NAME to $STPKG_HOMESERV"
}
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter