From 4d81d3b52952edb7a0cc329b4d0b302599b6c4c7 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 8 Oct 2024 13:29:19 -0400 Subject: Axe wine stuff, add config.json, cleanup Signed-off-by: Andrew Opalach --- taro/scripts/kill_wallpaper.sh | 11 ----------- taro/scripts/make_prefix.sh | 25 ------------------------- taro/scripts/run_wallpaper.sh | 20 +++----------------- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100755 taro/scripts/kill_wallpaper.sh delete mode 100755 taro/scripts/make_prefix.sh (limited to 'taro/scripts') diff --git a/taro/scripts/kill_wallpaper.sh b/taro/scripts/kill_wallpaper.sh deleted file mode 100755 index 04f01f8..0000000 --- a/taro/scripts/kill_wallpaper.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /usr/bin/env sh - -USE_MAURI=$1 - -if [ "$USE_MAURI" = "true" ]; then - pkill mauri -else - export WINEPREFIX=$2 - wineserver -k - wineserver -w -fi diff --git a/taro/scripts/make_prefix.sh b/taro/scripts/make_prefix.sh deleted file mode 100755 index 9facae2..0000000 --- a/taro/scripts/make_prefix.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env sh - -export WINEPREFIX=$1 - -CONFIG_DIR=$2 - -install_dxvk() { - mkdir -p $CONFIG_DIR/tmp && cd $CONFIG_DIR/tmp - VER=$(curl https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE) - curl -OL https://github.com/doitsujin/dxvk/releases/download/v$VER/dxvk-$VER.tar.gz - tar xf dxvk-$VER.tar.gz - cd dxvk-$VER - curl -OL https://gist.githubusercontent.com/doitsujin/1652e0e3382f0e0ff611e70142684d01/raw/4b80903eb4a8c1033750175de4ebe64685725a3e/setup_dxvk.sh - chmod +x ./setup_dxvk.sh - ./setup_dxvk.sh . install - rm -r $CONFIG_DIR/tmp -} - -if [ ! -d $WINEPREFIX ]; then - wineboot --init - winecfg -v win10 - wineserver -w - install_dxvk - wineserver -w -fi diff --git a/taro/scripts/run_wallpaper.sh b/taro/scripts/run_wallpaper.sh index 5ce8bc6..a274889 100755 --- a/taro/scripts/run_wallpaper.sh +++ b/taro/scripts/run_wallpaper.sh @@ -1,20 +1,6 @@ #! /usr/bin/env sh - -USE_MAURI=$1 - -export mesa_glthread=true - -if [ "$USE_MAURI" = "true" ]; then - if [ "$5" = "true" ]; then - exec mauri -p $6/scene.pkg -w $7 -h $8 -m $3 - else - exec mauri -d $6 -w $7 -h $8 -m $3 - fi +if [ "$1" = "true" ]; then + exec mauri -p $2/scene.pkg -m $3 -w $4 -h $5 else - export WINEPREFIX=$2 - wineserver -k - wineserver -w - export WINEMONITOR=$3 - exec $4 ../../wallpaper_engine/wallpaper64.exe -control openWallpaper -file $6/project.json \ - -playInWindow "wallpaper" -width $7 -height $8 > $9 2>&1 + exec mauri -d $2 -m $3 -w $4 -h $5 fi -- cgit v1.2.3-101-g0448