From 3de954eceaccb521417965a629bccff7ad2424e4 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Nov 27 2017 14:59:22 +0000 Subject: fix opentoonz-stuff --- diff --git a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh index 5365061..0dd165e 100755 --- a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh @@ -32,13 +32,6 @@ TOONZSTUDIOPALETTE="$HOME/.config/OpenToonz/stuff/projects/studiopalette" EOF else - # add mypaint brushes if need - if [ ! -d "$CONFIG_DIR/stuff/library/mypaint brushes" ]; then - echo "fix config: copy mypaint brushes" - mkdir -p "$CONFIG_DIR/stuff/library" - cp -r "$BASE_DIR/share/opentoonz/stuff/library/mypaint brushes" "$CONFIG_DIR/stuff/library/" - fi - # fix paths INI="$HOME/.config/OpenToonz/SystemVar.ini" if [ -e "$INI" ]; then @@ -75,13 +68,15 @@ else fi fi - # update themes - echo "fix config: update themes" + # update library + echo "update stuff" + mkdir -p "$CONFIG_DIR/stuff/config" + mkdir -p "$CONFIG_DIR/stuff/profiles" + cp -ur "$BASE_DIR/share/opentoonz/stuff/library" "$CONFIG_DIR/stuff/" cp -ur "$BASE_DIR/share/opentoonz/stuff/config/qss" "$CONFIG_DIR/stuff/config/" - - # update localizations - echo "fix config: update themes" cp -ur "$BASE_DIR/share/opentoonz/stuff/config/loc" "$CONFIG_DIR/stuff/config/" + cp -ur "$BASE_DIR/share/opentoonz/stuff/profiles/layouts" "$CONFIG_DIR/stuff/profiles/" + cp -ur "$BASE_DIR/share/opentoonz/stuff/config/current.txt" "$CONFIG_DIR/stuff/config/" fi cd "$BASE_DIR/bin"