Skip to content

Commit 2e19551

Browse files
author
arch
committed
conda testing
1 parent 7328940 commit 2e19551

5 files changed

Lines changed: 19 additions & 144 deletions

File tree

contrib/OpenFunscripter/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

contrib/OpenFunscripter/funscript_generator_linux.lua

Lines changed: 0 additions & 44 deletions
This file was deleted.

contrib/OpenFunscripter/funscript_generator_ubuntu_miniconda.lua

Lines changed: 0 additions & 46 deletions
This file was deleted.

contrib/OpenFunscripter/funscript_generator_windows.lua

Lines changed: 0 additions & 44 deletions
This file was deleted.

contrib/OpenFunscripter/openfunscripter_setup_linux.sh

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
if command -v apt; then
4-
sudo apt install -y cmake build-essential libmpv-dev libglvnd-dev libxext-dev
4+
sudo apt install -y cmake build-essential libmpv-dev libglvnd-dev libxext-dev make git gcc g++ cmake libmpv-dev libatlas-base-dev
55
fi
66

77
if [ -d ./OFS ]; then
@@ -28,5 +28,21 @@ make -j$(expr $(nproc) \+ 1)
2828
popd
2929
popd
3030

31-
echo "copy lua plugin"
32-
cp -vf funscript_generator_linux.lua OFS/bin/data/lua
31+
echo "install ofs extension"
32+
mkdir -p ~/.local/share/OFS/OFS_data/extensions/MTFG
33+
pushd ~/.local/share/OFS/OFS_data/extensions/MTFG
34+
if [ -d ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor ]; then
35+
git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
36+
fi
37+
38+
pushd ~/.local/share/OFS/OFS_data/extensions/MTFG/Python-Funscript-Editor
39+
git pull
40+
source ~/anaconda3/etc/profile.d/conda.sh 2>/dev/null
41+
source ~/miniconda3/etc/profile.d/conda.sh 2>/dev/null
42+
conda env create -f environment_ubuntu.yaml
43+
bash download_ffmpeg.sh
44+
popd
45+
46+
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
47+
48+
popd

0 commit comments

Comments
 (0)