Skip to content

Commit feb0e20

Browse files
author
arch
committed
fix ffmpeg
1 parent 2e19551 commit feb0e20

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

assets/ffmpeg

74.3 MB
Binary file not shown.

contrib/OpenFunscripter/openfunscripter_setup_linux.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ popd
3131
echo "install ofs extension"
3232
mkdir -p ~/.local/share/OFS/OFS_data/extensions/MTFG
3333
pushd ~/.local/share/OFS/OFS_data/extensions/MTFG
34-
if [ -d ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor ]; then
34+
if [ ! -d ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor ]; then
3535
git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
3636
fi
3737

@@ -40,7 +40,12 @@ git pull
4040
source ~/anaconda3/etc/profile.d/conda.sh 2>/dev/null
4141
source ~/miniconda3/etc/profile.d/conda.sh 2>/dev/null
4242
conda env create -f environment_ubuntu.yaml
43-
bash download_ffmpeg.sh
43+
if [ -f ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/assets/ffmpeg ]; then
44+
cp -fv ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/assets/ffmpeg ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/funscript_editor/data/ffmpeg
45+
else
46+
# TODO newes ffmpeg break MTFG!!
47+
bash download_ffmpeg.sh
48+
fi
4449
popd
4550

4651
cp -fv ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor/contrib/Installer/assets/main.lua ~/.local/share/OFS/OFS_data/extensions/MTFG/main.lua

0 commit comments

Comments
 (0)