Commit c0b31a87 authored by kyodev's avatar kyodev

release 4.14.O

parent 8e867717
......@@ -7,7 +7,7 @@ date au format: YYYY-MM-DD
## [ Unreleased ]
## [ 4.13.0 ] - 2018.06.12
## [ 4.14.0 ] - 2018.06.12
* syncro: composants, fscript_update avec ses parametres d'appel
* fix: fflash_install, effacement correct archive téléchargée
......
# getFlashPlayer
![version: 4.13.O](https://img.shields.io/badge/version-4.13.O-blue.svg?longCache=true&style=for-the-badge)
![version: 4.14.O](https://img.shields.io/badge/version-4.14.O-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)
......
#!/bin/bash
version=4.13.O
version=4.14.O
date="12/06/2018"
script="getFlashPlayer"
# contact="IRC ##sdeb@freenode.net ou https://framagit.org/sdeb/getFlashPlayer/issues"
......@@ -357,24 +357,23 @@ fflash_get_version(){ # 24/01/2018
fflash_install(){ # 12/06/2018
local versArchive recup_url dirTemp="/tmp/$script"
if [ ! -w "dirTemp" ]; then # normalement pas utile...
dirtemp+="-$RANDOM"
[ ! -w "dirTemp" ] && f__error "droits insuffisants, recommencer avec les droits root"
fi
[[ "$operation" != "upgrade" && -z "$dl_only" ]] && fflash_avertissement
if [ "$1" == "manuel" ]; then
versArchive=${2%\.tar*} # flashplayer_28.0.0.137_npapi_linux64.tar.gz
versArchive=${versArchive%_npapi*}
versArchive=${versArchive#*_}
versArchive=${versArchive##*_}
f__info "installation manuelle de FlashPlayer version $versArchive ($2)"
fileTemp="$2"
mkdir -p "$dirTemp"
else
(( x_get_version == 1 )) || fflash_get_version "quiet"
if ! mkdir -p "$dirTemp" 2>/dev/null; then # contournement bug? bash, utile si téléchargement et mauvais effacement précédent, normalement sans objet avec getFlash
dirTemp+="-$RANDOM"
! mkdir -p "$dirTemp" 2>/dev/null && f__error "droits insuffisants, recommencer avec les droits root"
fi
[ -z "$dl_only" ] && f__info "installation FlashPlayer, version $ver_flash"
mkdir -p "$dirTemp"
(( x_get_version == 1 )) || fflash_get_version "quiet"
fileTemp="$dirTemp/flashplayer_${ver_flash}_npapi_linux$( getconf LONG_BIT ).tar.gz"
# détection/chargement/test archive plugin flashplayer
# téléchargement
f__info " - téléchargement..."
recup_url="https://fpdownload.adobe.com/get/flashplayer/pdc/"
recup_url+="$ver_flash/flash_player_npapi_linux.$fu_archi.tar.gz"
......@@ -384,23 +383,27 @@ fflash_install(){ # 12/06/2018
fi
fi
f__archive_test "$fileTemp" || f__error " Le fichier $fileTemp n'est pas une archive tar.gz valide"
if [[ "$dl_to_svg" || "$dl_only" ]]; then
chown "$fu_user:" "$fileTemp"
cp --preserve "$fileTemp" ./
fi
if [ "$dl_only" ]; then
rm fr "$fileTemp"
rm -f "$fileTemp"
echo
return 0
fi
# décompression archive téléchargée dans dossier de travail
f__info "\\n - décompression..."
tar -xaf "$fileTemp" -C "$dirTemp/"
# copie de la bibliothèque flash dans plugins/ user mozilla
mkdir -p "$dir_install"
cp -f "$dirTemp/libflashplayer.so" "$dir_install/"
chown -R "$fu_user:" "$dir_install"
# svg éventuelle archive, effacement répertoire temporaire
# effacement répertoire temporaire
rm -fr "$dirTemp"
[ "$1" != "manuel" ] && versArchive=$ver_flash
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment