diff --git a/helper/spark-dwine-helper/scale-set-helper/bunny.txt b/helper/spark-dwine-helper/scale-set-helper/bunny.txt new file mode 100644 index 0000000..61a39f5 --- /dev/null +++ b/helper/spark-dwine-helper/scale-set-helper/bunny.txt @@ -0,0 +1,92 @@ + ___ +( ) + | | .-. ___ ___ .--. .--. + | |/ \ ( )( ) / \ / \ + | .-. . | | | | ; ,-. ' | .-. ; + | | | | | | | | | | | | | | | | + | | | | | | | | | | | | | |/ | + | | | | | | | | | | | | | ' _.' + | | | | | | ; ' | ' | | | .'.-. + | | | | ' `-' / ' `-' | ' `-' / +(___)(___) '.__.' `.__. | `.__.' + ( `-' ; + `.__. + ___ +( ) + | |.-. .---. ___ .-. .--. ___ .-. + | / \ / .-, \ ( ) \ / \ ( ) \ + | .-. | (__) ; | | ' .-. ; | .-. ; | .-. . + | | | | .'` | | / (___) | | | | | | | | + | | | | / .'| | | | | | | | | | | | + | | | | | / | | | | | | | | | | | | + | ' | | ; | ; | | | | ' | | | | | | + ' `-' ; ' `-' | | | ' `-' / | | | | + `.__. `.__.'_. (___) `.__.' (___)(___) + + + ___ +( ) + | |.-. ___ ___ ___ .-. ___ .-. ___ ___ + | / \ ( )( ) ( ) \ ( ) \ ( )( ) + | .-. | | | | | | .-. . | .-. . | | | | + | | | | | | | | | | | | | | | | | | | | + | | | | | | | | | | | | | | | | | ' | | + | | | | | | | | | | | | | | | | ' `-' | + | ' | | | | ; ' | | | | | | | | `.__. | + ' `-' ; ' `-' / | | | | | | | | ___ | | + `.__. '.__.' (___)(___) (___)(___) ( )' | + ; `-' ' + .__.' + ............ .....]OOOo]`.... + ... ........ ...=OOOOOOOOO\.. + .../OOOOOOO`.... ..=OOO@/[\OOOOO. + ..=OOOOOOOOO\... .,@OO^/....O@O@` + ..OOOOOO[[OOO@`. .=OO@,...=.OOOO. + ..OOOOO./O^,@OO` .=OO^....,.@OO^. + ..\OOO@^...=OOOO.... .OOO^*..,`/OOO.. + ...\OOOOOOOooooO^... .=OO^...`=OO@`.. + ..=@O@OooOOOOO@`...........=@@O]].,@O@`... + .,@OoOO`...O@^......,]]]]/OOOOOOO@@... . + ...\OO@]]]OOOO@@@@@@@@@@@@@@@@@@@OO..... + .....[@@OOO@@@@@@@@@@@@@@@@@@@@@@@@@@`.. + ..OOO@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`.... + .,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\... + ....=@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@^.. + ...=@@@@@@@@@@@@@@@@@@@@@@`,\@@@@@@@@@@@@@^. + ..,@@@@@@@@@@@@@@@@@@@@@@@O,[].\@@@@@@@@@@@. + ../@@@@@@@@@@@@O@@@@@@@@@@@......\@@@@@@@@@^ + .,@@@@@@@@@@@O`.\@@@@@@@@@/........\@@@@@@@@... + .=@@@@@@@@@/.....\@@@@@@@@/`...[O`..\@@@@@@@`... + .=@@@@@@@^,O[..,`.,@@@@@/../@@O[`...,@@@@@@@.... + ....@@@@@@@O`,@@O[]..,@/[`..=oo@O`,^...@@@@@@@@`.. + ....O@@@@@@@@`,OOO@^*\.........\..../.../@`.=^.. + .. ...,@^=@@@^.\`...,^...........[[......O]//... + ..,\]@@@\...[`....................=@@/.... + .=@@\............,]/`........../@@@\.. . + .....@@@@@\.....................,/@@@@@@\... + ...=@@@@@@@@\]..............]@@@@@@@@@@@@`. + ...,@@@@@@@@@@@@@@/[\O@@O/[*./@@@@@@@@@@@@@\....... + ...@@@@@@@@@@@@@@@^.,O@@@@^../@@@@@@@@@@@@@@@\..... +..........@@@@@@@@@@@@@@@@@`..`\/`../@@@@@@@@@@@@@@@@@@@@]] +........,@@@@@@@@@@@@@@@@/*[\].,`]/[[@@@@@@@@@@@@@@,[[[[`.. +..,O\/@@@@@@@@@@@@@@@@@@@`...........O@@O@@@@@@@@@@\.... +.....\@@@@@@@@@@@@@@@@@@@OO\`,O.. .,@OOO@@@@@@@@@@. .. + ..../@@@@@@@@@@@@@@OO@`.^,O. ..=@OOO@@@@@@@@@.. . + ...=@@@@@@@@@@@@@@@@@O[[.... ...\@@@@@@@@@@@/.. . + ...=@@@@@@@@@@@@@@,^ ....O...\@@@@@@` + ....@@@@@@@@@@@@@/.. ...^/\]/[\@@@@`. + .@@@@/@@@@@@@^O..... ...,@@^]..]@/... + ...\@`.[@@@@@@...... .=`@@@@@^..^.... + ....`....[@@@O\.[,..........OO@@@@@^.,[[.... + ............\@@@\`...,`**,]@@@@@@@^......... +.. .,@@@@@@@@@@@@@@@@@@/... + ..O@@@@@@@@@@@@@@@@@^... + ..O@@@@@@^...=@@@@@@@... + ..@@@@@@@\...=@@@@@@@^.. + .=@@@@@@@@...=@@@@@@@O.. + .=@@@@@@@@`..=@@@@@@@@.. + .=@@@O@@@@^..=@@OO@@@@^. + .O@OOOOO@O^..=@OOOOOOO^. + .Oo/[\O/\O@..=/[\O/\o*O. + .O^......=O...^......*/. + .=\.....]O^...\\...]//.. .. ........ \ No newline at end of file diff --git a/helper/spark-dwine-helper/scale-set-helper/get-scale.sh b/helper/spark-dwine-helper/scale-set-helper/get-scale.sh new file mode 100755 index 0000000..5f048d1 --- /dev/null +++ b/helper/spark-dwine-helper/scale-set-helper/get-scale.sh @@ -0,0 +1,82 @@ +#/bin/bash +source /opt/durapps/transhell/transhell.sh +load_transhell_debug + +#########>>>>>>>函数段 +Get_Dist_Name() +{ + if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then + DISTRO='Deepin' + elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then + DISTRO='UniontechOS' + elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then + DISTRO='UniontechOS' + else + DISTRO='OtherOS' + fi +} +#########<<<<<<< + +if [ $# -lt 1 ]; then +echo "无参数，无法启动。这是一个set-wine-scale的组件，一般来说，你不会需要单独启动这个脚本" +echo "请参考set-wine-scale.sh使用" +echo "参数为CONTAINER_PATH" +echo "只读取第一个，其他参数会被放弃" +fi + +CONTAINER_PATH="$1" + +if [ ! -f "$CONTAINER_PATH/user.reg" ];then + echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本" + echo "E: Can not find user.reg. Exit. You should use this script after the extraction" + exit 1 +fi + + +mkdir -p $HOME/.config/spark-wine/ +#####全局参数位置 +#####能到这一步的说明已经是没有自定义参数了，直接读全局覆盖没问题 +##### + +if [ -f "$HOME/.config/spark-wine/scale.txt" ];then + cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt + echo "检测到已经设置过全局参数，直接复制" + echo "全局参数的位置在$HOME/.config/spark-wine/scale.txt，如果需要更换请删除此文件重新生成" + exit +fi + + +Get_Dist_Name +if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then +echo 1.0 > $HOME/.config/spark-wine/scale.txt +cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt +#####就是1倍缩放 +exit +fi + + + +dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'` +scale_factor=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + 1.0 \ + 1.25 \ + 1.5 \ + 1.75 \ + 2.0` + +case "$scale_factor" in + "") + zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}${TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST}" --width=500 --height=150 + scale_factor="1.0" + ;; + *) +zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}！${TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST}" --width=500 --height=150 + ;; +esac +echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt +cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt + diff --git a/helper/spark-dwine-helper/scale-set-helper/set-wine-scale.sh b/helper/spark-dwine-helper/scale-set-helper/set-wine-scale.sh new file mode 100755 index 0000000..7108ddb --- /dev/null +++ b/helper/spark-dwine-helper/scale-set-helper/set-wine-scale.sh @@ -0,0 +1,186 @@ +#!/bin/bash + +help() { + cat < $CONTAINER_PATH/scale.txt + wine_scale=`cat $CONTAINER_PATH/scale.txt` + echo "检测到的缩放倍数为:$wine_scale" + echo "Scale is $wine_scale" +fi +else +wine_scale=`cat $CONTAINER_PATH/scale.txt` + +echo "检测到的缩放倍数为:$wine_scale" +echo "Scale is $wine_scale" + + +fi +#####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的 + + + +else +#######指定了缩放倍数 +echo "使用了--set-scale-factor，直接指定" +echo "--set-scale-factor detected. Arrange directly" + + +if [ "$appointed_scale_factor" != "1.0" ] && [ "$appointed_scale_factor" != "1.25" ] && [ "$appointed_scale_factor" != "1.5" ] && [ "$appointed_scale_factor" != "1.75" ] && [ "$appointed_scale_factor" != "2.0" ] ;then +echo "无法识别的倍数：$appointed_scale_factor，请参看$0 -h" +echo "Unrecognizable number. Use $0 -h to get help" +exit 1 +fi +#######没问题了再用 +echo "$appointed_scale_factor" > $CONTAINER_PATH/scale.txt +wine_scale=`cat $CONTAINER_PATH/scale.txt` + +fi + +########开始设置 +########如果环境变量里没指定了APPRUN_CMD（在run.sh中）就替换，如果有就直接用来设置 + +if [ "$APPRUN_CMD" = "" ];then +echo "没有检测到APPRUN_CMD环境变量，执行sed替换。如果要使用wine原生提供的方法，请在环境变量中指定(export)" +case "$wine_scale" in + 1.0*) + reg_text="\"LogPixels\"=dword:00000060" + ;; + 1.25*) + reg_text="\"LogPixels\"=dword:00000078" + ;; + 1.5*) + reg_text="\"LogPixels\"=dword:00000090" + ;; + 1.75*) + reg_text="\"LogPixels\"=dword:000000A8" + ;; + 2.0*) + reg_text="\"LogPixels\"=dword:000000C0" + ;; + *) + reg_text="\"LogPixels\"=dword:00000060" + #可能不是Xorg + ;; + esac + +#####根据scale设置dword值 + + +LogPixels_line=(`sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg`) +#####关键词行数取得 +until [ "${#LogPixels_line[@]}" = "0" ];do + + +line_num=${LogPixels_line[0]} + +sed -i "$line_num"c\ "$reg_text" "$CONTAINER_PATH/user.reg" +LogPixels_line=(${LogPixels_line[@]:1}) +done + +echo "已经完成替换。位置：$CONTAINER_PATH/user.reg" +echo "在以下行数进行了替换，内容为$reg_text" +echo `sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg` +echo "---------------------------------------" + +else +#####用wine提供的方法 + +case "$wine_scale" in + 1.0*) + dpi="96" + ;; + 1.25*) + dpi="120" + ;; + 1.5*) + dpi="144" + ;; + 1.75*) + dpi="168" + ;; + 2.0*) + dpi="192" + ;; + *) + dpi="96" + #可能不是Xorg或者是其他错误 + ;; + esac +echo "用$APPRUN_CMD执行指令" +echo "指令为" +echo "env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f" + +env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f + +fi diff --git a/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell b/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell new file mode 100644 index 0000000..597e9bd --- /dev/null +++ b/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell @@ -0,0 +1,8 @@ +#!/bin/bash +TRANSHELL_CONTENT_OPTION="Options" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="Your dimension is ：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="Please choose one option below" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="Setting 1.0 scale as default" +TRANSHELL_CONTENT_SCALE_IS="Scale multiple is " +TRANSHELL_CONTENT_SAVED="saved." +TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST="You can use spark wine helper settings to adjust settings" diff --git a/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell b/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell new file mode 100644 index 0000000..150a72b --- /dev/null +++ b/helper/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell @@ -0,0 +1,8 @@ +#!/bin/bash +TRANSHELL_CONTENT_OPTION="选项" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="您的分辨率是：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="请在以下选项中选择一个" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="默认为1倍缩放。" +TRANSHELL_CONTENT_SCALE_IS="缩放倍数为" +TRANSHELL_CONTENT_SAVED="已保存" +TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST="您可以使用星火wine助手设置来重新设置" diff --git a/helper/spark-dwine-helper/spark-dwine-helper-settings/settings.sh b/helper/spark-dwine-helper/spark-dwine-helper-settings/settings.sh new file mode 100755 index 0000000..3ef94cb --- /dev/null +++ b/helper/spark-dwine-helper/spark-dwine-helper-settings/settings.sh @@ -0,0 +1,109 @@ +#/bin/bash + +source /opt/durapps/transhell/transhell.sh +load_transhell_debug + +until [ "$IS_CLOSE" = "1" ];do + +CHOSEN_SETTINGS=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + "${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}" \ + "${TRANSHELL_CONTENT_SET_APP_SCALE}" \ + "${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}" \ + "${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}" ` + +echo "$CHOSEN_SETTINGS" +case "$CHOSEN_SETTINGS" in + "${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}") +######## + zenity --info --text="${TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST}" --width=500 --height=150 + +dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'` +scale_factor=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + 1.0 \ + 1.25 \ + 1.5 \ + 1.75 \ + 2.0` + +case "$scale_factor" in + "") + zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}" --width=500 --height=150 + scale_factor="1.0" + ;; + *) +zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150 + ;; +esac +echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt + + + ;; +######## + + + + + "${TRANSHELL_CONTENT_SET_APP_SCALE}") + zenity --info --text="${TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY}" --width=500 --height=150 + CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory` + + if [ ! -f "$CONTAINER_PATH/user.reg" ];then + zenity --info --text="${TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE}" --width=500 --height=150 + + else + + dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'` +scale_factor=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + 1.0 \ + 1.25 \ + 1.5 \ + 1.75 \ + 2.0 \ + ${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL} ` + +case "$scale_factor" in + "") + zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}。" --width=500 --height=150 + scale_factor="1.0" +/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH + ;; + "${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL}") + zenity --info --text="${TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL}" --width=500 --height=150 + rm $CONTAINER_PATH/scale.txt + ;; + *) +zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150 +/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH + ;; +esac + + +fi + ;; + "${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}") + find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \; + zenity --info --text="${TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL}：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150 + ;; + "${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}") + + ;; + + *) + IS_CLOSE="1" + ;; + + +esac +done diff --git a/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell b/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell new file mode 100644 index 0000000..61e7d28 --- /dev/null +++ b/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell @@ -0,0 +1,18 @@ +#!/bin/bash +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to spark wine helper settings，Please choose one option below to excute" +TRANSHELL_CONTENT_OPTION="Options" +TRANSHELL_CONTENT_SET_GLOBAL_SCALE="Set global scale" +TRANSHELL_CONTENT_SET_APP_SCALE="Set app scale" +TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="Sync all the wine app scale with global scale in one key" +TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="Note: The options above only take effect on spark-dwine-helper apps" +TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="Note：This option is invalid in deepin/UOS,for the script will read deepin/UOS scale settings first" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="Your dimension is ：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="Please choose one option below" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="Setting 1.0 scale as default" +TRANSHELL_CONTENT_SCALE_IS="Scale multiple is " +TRANSHELL_CONTENT_SAVED="saved." +TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="Please choose the directory the app you want to adjust in（Please choose DIRECTORY instead of file）" +TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="E：user.reg can not be found.This is not a wine bottle" +TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="Sync with global scale settings" +TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="Will sync with global scale settings" +TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="The scale settings of apps in bottle below is already syncd with global scale settings" diff --git a/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell b/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell new file mode 100644 index 0000000..6532643 --- /dev/null +++ b/helper/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell @@ -0,0 +1,18 @@ +#!/bin/bash +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火wine助手控制中心，请在以下选项中选择一个执行！" +TRANSHELL_CONTENT_OPTION="选项" +TRANSHELL_CONTENT_SET_GLOBAL_SCALE="设置全局缩放" +TRANSHELL_CONTENT_SET_APP_SCALE="设置单独应用缩放" +TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="一键将所有已安装应用的缩放设置改为与全局缩放一致" +TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="备注：以上操作仅对使用了spark-dwine-helper的应用生效" +TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="请注意：此选项对deepin/UOS无效，会优先读取deepin/UOS的缩放设置进行缩放" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="您的分辨率是：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="请在以下选项中选择一个" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="默认为1倍缩放。" +TRANSHELL_CONTENT_SCALE_IS="缩放倍数为" +TRANSHELL_CONTENT_SAVED="已保存" +TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="请在接下来的文件选择框选中所需的应用所在的容器文件夹（注意要选择文件夹）" +TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="错误：找不到user.reg.这不是一个wine容器" +TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="与全局设置同步" +TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="将会与全局设置同步" +TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="以下容器中的应用的缩放设置已与全局设置同步" diff --git a/helper/README.txt b/helper/tools/README.txt similarity index 100% rename from helper/README.txt rename to helper/tools/README.txt diff --git a/helper/SetDpi.sh b/helper/tools/SetDpi.sh similarity index 100% rename from helper/SetDpi.sh rename to helper/tools/SetDpi.sh diff --git a/helper/add_hotkeys b/helper/tools/add_hotkeys similarity index 100% rename from helper/add_hotkeys rename to helper/tools/add_hotkeys diff --git a/helper/autostart b/helper/tools/autostart similarity index 100% rename from helper/autostart rename to helper/tools/autostart diff --git a/helper/autostart_all.sh b/helper/tools/autostart_all.sh similarity index 100% rename from helper/autostart_all.sh rename to helper/tools/autostart_all.sh diff --git a/helper/autostart_wine.sh b/helper/tools/autostart_wine.sh similarity index 100% rename from helper/autostart_wine.sh rename to helper/tools/autostart_wine.sh diff --git a/helper/box86-activex b/helper/tools/box86-activex similarity index 100% rename from helper/box86-activex rename to helper/tools/box86-activex diff --git a/helper/deepin-wine-banner b/helper/tools/deepin-wine-banner similarity index 100% rename from helper/deepin-wine-banner rename to helper/tools/deepin-wine-banner diff --git a/helper/get_tray_window b/helper/tools/get_tray_window similarity index 100% rename from helper/get_tray_window rename to helper/tools/get_tray_window diff --git a/helper/kill.sh b/helper/tools/kill.sh similarity index 100% rename from helper/kill.sh rename to helper/tools/kill.sh diff --git a/helper/log.sh b/helper/tools/log.sh similarity index 100% rename from helper/log.sh rename to helper/tools/log.sh diff --git a/helper/map_device.sh b/helper/tools/map_device.sh similarity index 100% rename from helper/map_device.sh rename to helper/tools/map_device.sh diff --git a/helper/register_font.sh b/helper/tools/register_font.sh similarity index 100% rename from helper/register_font.sh rename to helper/tools/register_font.sh diff --git a/helper/run.sh b/helper/tools/run.sh similarity index 100% rename from helper/run.sh rename to helper/tools/run.sh diff --git a/helper/run_activex.sh b/helper/tools/run_activex.sh similarity index 100% rename from helper/run_activex.sh rename to helper/tools/run_activex.sh diff --git a/helper/run_v2.sh b/helper/tools/run_v2.sh similarity index 100% rename from helper/run_v2.sh rename to helper/tools/run_v2.sh diff --git a/helper/run_v3.sh b/helper/tools/run_v3.sh similarity index 100% rename from helper/run_v3.sh rename to helper/tools/run_v3.sh diff --git a/helper/run_v4.sh b/helper/tools/run_v4.sh similarity index 100% rename from helper/run_v4.sh rename to helper/tools/run_v4.sh diff --git a/helper/sendkeys.exe b/helper/tools/sendkeys.exe similarity index 100% rename from helper/sendkeys.exe rename to helper/tools/sendkeys.exe diff --git a/helper/sendkeys.sh b/helper/tools/sendkeys.sh similarity index 100% rename from helper/sendkeys.sh rename to helper/tools/sendkeys.sh diff --git a/helper/spark_get_tray_window b/helper/tools/spark_get_tray_window similarity index 100% rename from helper/spark_get_tray_window rename to helper/tools/spark_get_tray_window diff --git a/helper/spark_kill.sh b/helper/tools/spark_kill.sh similarity index 100% rename from helper/spark_kill.sh rename to helper/tools/spark_kill.sh diff --git a/helper/spark_run_v4.sh b/helper/tools/spark_run_v4.sh similarity index 90% rename from helper/spark_run_v4.sh rename to helper/tools/spark_run_v4.sh index 5166e64..170d085 100755 --- a/helper/spark_run_v4.sh +++ b/helper/tools/spark_run_v4.sh @@ -13,9 +13,10 @@ source /opt/durapps/transhell/transhell.sh load_transhell_debug -WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@" -APPDIR="/opt/deepinwine/apps/@public_bottle_name@" -APPVER="@deb_version_string@" +BOTTLENAME="$1" +WINEPREFIX="$HOME/.deepinwine/$1" +APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files" +APPVER="" APPTAR="files.7z" BOTTLENAME="" WINE_CMD="deepin-wine" @@ -91,11 +92,39 @@ HelpApp() echo " -h/--help Show program help info" } #############帮助文件 + +check_link() +{ + if [ ! -d "$1" ];then + echo "$1 不是目录，不能创建$2软连接" + return + fi + link_path=$(realpath "$2") + target_path=$(realpath "$1") + if [ "$link_path" != "$target_path" ];then + if [ -d "$2" ];then + mv "$2" "${2}.bak" + else + rm "$2" + fi + echo "修复$2软连接为$1" + ln -s -f "$1" "$2" + fi +} + FixLink() { if [ -d ${WINEPREFIX} ]; then CUR_DIR=$PWD cd "${WINEPREFIX}/dosdevices" + # Link to Document +if [ -L "$WINEPREFIX/drive_c/users/$(whoami)/My Documents" ]; then + env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\My Documents" /f + +else + env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\Documents" /f + +fi rm c: z: y: ln -s -f ../drive_c c: ln -s -f / z: @@ -115,7 +144,7 @@ DisableWrite() mkdir "${1}" chmod -w "${1}" } -########如果有该文件夹则删除，然后再创建一个不允许写入的（这东西是被用在了QQ启动上，看来腾讯不怎么好对付） +########如果有该文件夹则删除，然后再创建一个不允许写入的 is_autostart() { AUTOSTART="/opt/deepinwine/tools/autostart" @@ -146,7 +175,7 @@ CallProcess() #kill bloack process is_autostart $DEB_PACKAGE_NAME autostart=$? - if [ $autostart -ne 0 ];then + if [[ $autostart -ne 0 ]] && [[ "$1" != *"pluginloader.exe" ]];then $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block fi @@ -161,14 +190,7 @@ CallProcess() fi # Disable winemenubuilder env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f - # Link to Document -if [ -L "$WINEPREFIX/drive_c/users/$(whoami)/My Documents" ]; then - env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\My Documents" /f -else - env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\Documents" /f - -fi @@ -209,6 +231,9 @@ UnixUriToDosPath() #### CallApp段，根据容器名找专属优化，没有就走通用启动 CallApp() { + +PID_BANNER=$! + FixLink debug_log "CallApp $BOTTLENAME arg count $#: $*" if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh" ];then @@ -223,9 +248,10 @@ if [ -f "$APP_CONFIG_PATH" ]; then source $APP_CONFIG_PATH else echo "$APP_CONFIG_PATH 文件不存在，执行通用启动" - CallProcess "$@" + CallProcess "$@" fi + } ExtractApp() { @@ -235,10 +261,10 @@ local tmp_log=$(mktemp) cmd_pid=$! (while kill -0 $cmd_pid 2> /dev/null; do - cat "${tmp_log}" + tail -n 1 "${tmp_log}" sleep 1 - done)| zenity --progress --title="$BOTTLENAME" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." --width=400 --auto-close --no-cancel - + done)| zenity --progress --title="${TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL}" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." --width=600 --auto-close --no-cancel +rm $tmp_log mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER" @@ -377,7 +403,7 @@ case $4 in "-r" | "--reset") ResetApp ;; - "-c" | "--create") + "-cb" | "--create") CreateBottle ;; "-e" | "--remove") diff --git a/helper/spark_run_v4_app_configs/Deepin-CS6.sh b/helper/tools/spark_run_v4_app_configs/Deepin-CS6.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-CS6.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-CS6.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-Dding.sh b/helper/tools/spark_run_v4_app_configs/Deepin-Dding.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-Dding.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-Dding.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-Evernote.sh b/helper/tools/spark_run_v4_app_configs/Deepin-Evernote.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-Evernote.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-Evernote.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-FastReadPDF.sh b/helper/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-FastReadPDF.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-Foxmail.sh b/helper/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-Foxmail.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-MTXX.sh b/helper/tools/spark_run_v4_app_configs/Deepin-MTXX.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-MTXX.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-MTXX.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQ-Spark.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQ-Spark.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQ.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQ.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQ.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQ.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQBydr.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQBydr.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQGame.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQGame.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQGame.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQGame.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQHlddz.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQHlddz.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQMnsj.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQMnsj.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-QQSszb.sh b/helper/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-QQSszb.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-THS.sh b/helper/tools/spark_run_v4_app_configs/Deepin-THS.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-THS.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-THS.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-TIM.sh b/helper/tools/spark_run_v4_app_configs/Deepin-TIM.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-TIM.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-TIM.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-TencentVideo.sh b/helper/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-TencentVideo.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-WXWork.sh b/helper/tools/spark_run_v4_app_configs/Deepin-WXWork.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-WXWork.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-WXWork.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-WangWang.sh b/helper/tools/spark_run_v4_app_configs/Deepin-WangWang.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-WangWang.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-WangWang.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-WeChat.sh b/helper/tools/spark_run_v4_app_configs/Deepin-WeChat.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-WeChat.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-WeChat.sh diff --git a/helper/spark_run_v4_app_configs/Deepin-ZhuMu.sh b/helper/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Deepin-ZhuMu.sh rename to helper/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh diff --git a/helper/spark_run_v4_app_configs/IE8.sh b/helper/tools/spark_run_v4_app_configs/IE8.sh similarity index 100% rename from helper/spark_run_v4_app_configs/IE8.sh rename to helper/tools/spark_run_v4_app_configs/IE8.sh diff --git a/helper/spark_run_v4_app_configs/Spark-CloudMusic.sh b/helper/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-CloudMusic.sh rename to helper/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh diff --git a/helper/spark_run_v4_app_configs/Spark-MailMaster.sh b/helper/tools/spark_run_v4_app_configs/Spark-MailMaster.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-MailMaster.sh rename to helper/tools/spark_run_v4_app_configs/Spark-MailMaster.sh diff --git a/helper/spark_run_v4_app_configs/Spark-MuBu.sh b/helper/tools/spark_run_v4_app_configs/Spark-MuBu.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-MuBu.sh rename to helper/tools/spark_run_v4_app_configs/Spark-MuBu.sh diff --git a/helper/spark_run_v4_app_configs/Spark-QQ.sh b/helper/tools/spark_run_v4_app_configs/Spark-QQ.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-QQ.sh rename to helper/tools/spark_run_v4_app_configs/Spark-QQ.sh diff --git a/helper/spark_run_v4_app_configs/Spark-QQMusic.sh b/helper/tools/spark_run_v4_app_configs/Spark-QQMusic.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-QQMusic.sh rename to helper/tools/spark_run_v4_app_configs/Spark-QQMusic.sh diff --git a/helper/spark_run_v4_app_configs/Spark-TIM.sh b/helper/tools/spark_run_v4_app_configs/Spark-TIM.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-TIM.sh rename to helper/tools/spark_run_v4_app_configs/Spark-TIM.sh diff --git a/helper/spark_run_v4_app_configs/Spark-WeCom.sh b/helper/tools/spark_run_v4_app_configs/Spark-WeCom.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-WeCom.sh rename to helper/tools/spark_run_v4_app_configs/Spark-WeCom.sh diff --git a/helper/spark_run_v4_app_configs/Spark-douyin.sh b/helper/tools/spark_run_v4_app_configs/Spark-douyin.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-douyin.sh rename to helper/tools/spark_run_v4_app_configs/Spark-douyin.sh diff --git a/helper/spark_run_v4_app_configs/Spark-ecloud.sh b/helper/tools/spark_run_v4_app_configs/Spark-ecloud.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-ecloud.sh rename to helper/tools/spark_run_v4_app_configs/Spark-ecloud.sh diff --git a/helper/spark_run_v4_app_configs/Spark-flyele.sh b/helper/tools/spark_run_v4_app_configs/Spark-flyele.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-flyele.sh rename to helper/tools/spark_run_v4_app_configs/Spark-flyele.sh diff --git a/helper/spark_run_v4_app_configs/Spark-weixin.sh b/helper/tools/spark_run_v4_app_configs/Spark-weixin.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Spark-weixin.sh rename to helper/tools/spark_run_v4_app_configs/Spark-weixin.sh diff --git a/helper/spark_run_v4_app_configs/Wine-QQ.sh b/helper/tools/spark_run_v4_app_configs/Wine-QQ.sh similarity index 100% rename from helper/spark_run_v4_app_configs/Wine-QQ.sh rename to helper/tools/spark_run_v4_app_configs/Wine-QQ.sh diff --git a/helper/spark_run_v4_app_configs/wxwork-spark-uk.sh b/helper/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh similarity index 100% rename from helper/spark_run_v4_app_configs/wxwork-spark-uk.sh rename to helper/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh diff --git a/helper/spark_updater b/helper/tools/spark_updater similarity index 100% rename from helper/spark_updater rename to helper/tools/spark_updater diff --git a/helper/startbottle.exe b/helper/tools/startbottle.exe similarity index 100% rename from helper/startbottle.exe rename to helper/tools/startbottle.exe diff --git a/helper/tools/transhell/spark_run_v4.sh_en_US.transhell b/helper/tools/transhell/spark_run_v4.sh_en_US.transhell new file mode 100644 index 0000000..0ea82ee --- /dev/null +++ b/helper/tools/transhell/spark_run_v4.sh_en_US.transhell @@ -0,0 +1,3 @@ +#!/bin/bash +TRANSHELL_CONTENT_UNPACKING="Preparing the following APP:" +TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="Spark Windows APP Compatibility Helper" diff --git a/helper/tools/transhell/spark_run_v4.sh_zh_CN.transhell b/helper/tools/transhell/spark_run_v4.sh_zh_CN.transhell new file mode 100644 index 0000000..78ef2f8 --- /dev/null +++ b/helper/tools/transhell/spark_run_v4.sh_zh_CN.transhell @@ -0,0 +1,3 @@ +#!/bin/bash +TRANSHELL_CONTENT_UNPACKING="正在为您准备以下应用：" +TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="星火Windows应用兼容助手" diff --git a/helper/updater b/helper/tools/updater similarity index 100% rename from helper/updater rename to helper/tools/updater diff --git a/helper/transhell/spark_run_v4.sh_en_US.transhell b/helper/transhell/spark_run_v4.sh_en_US.transhell deleted file mode 100644 index 08d0924..0000000 --- a/helper/transhell/spark_run_v4.sh_en_US.transhell +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -TRANSHELL_CONTENT_UNPACKING="Unpacking" diff --git a/helper/transhell/spark_run_v4.sh_zh_CN.transhell b/helper/transhell/spark_run_v4.sh_zh_CN.transhell deleted file mode 100644 index 1d7528b..0000000 --- a/helper/transhell/spark_run_v4.sh_zh_CN.transhell +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -TRANSHELL_CONTENT_UNPACKING="解包" diff --git a/helper/transhell/transhell.sh b/helper/transhell/transhell.sh new file mode 120000 index 0000000..e66f99b --- /dev/null +++ b/helper/transhell/transhell.sh @@ -0,0 +1 @@ +../../bashimport/transhell.sh \ No newline at end of file