Commit 1a7fba22 authored by Vladislav's avatar Vladislav

update

parent 3b831c9b
...@@ -4652,9 +4652,9 @@ gui_proton_downloader () { ...@@ -4652,9 +4652,9 @@ gui_proton_downloader () {
if [[ "$1" != "silent" ]] ; then if [[ "$1" != "silent" ]] ; then
for GIVE_ALL_WINE in ${VERSION_WINE_GIT} ; do for GIVE_ALL_WINE in ${VERSION_WINE_GIT} ; do
for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]} ${PROTON_GE_GIT[@]} ${WINE_KRON4EK[@]} ${PROTON_PW_GIT[@]}" ; do for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" ; do
if [[ $GIVE_WINE_URL =~ $GIVE_ALL_WINE ]] ; then if [[ ${GIVE_WINE_URL^^} =~ ${GIVE_ALL_WINE^^} ]] ; then
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL
fi fi
done done
pw_download_get_wine "" pw_download_get_wine ""
...@@ -4663,9 +4663,9 @@ gui_proton_downloader () { ...@@ -4663,9 +4663,9 @@ gui_proton_downloader () {
restart_pp restart_pp
else else
print_error "$PW_WINE_USE" print_error "$PW_WINE_USE"
for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]} ${PROTON_GE_GIT[@]} ${WINE_KRON4EK[@]} ${PROTON_PW_GIT[@]}" ; do for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" ; do
if [[ $GIVE_WINE_URL =~ $PW_WINE_USE ]] ; then if [[ ${GIVE_WINE_URL^^} =~ ${PW_WINE_USE^^} ]] ; then
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL
fi fi
done done
pw_download_get_wine "" pw_download_get_wine ""
...@@ -4787,9 +4787,9 @@ gui_edit_db () { ...@@ -4787,9 +4787,9 @@ gui_edit_db () {
ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%" ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%"
fi fi
done done
if [[ $CHECK_BOOLE_TRUE != 1 ]] ; then fi
ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%" if [[ $CHECK_BOOLE_TRUE != 1 ]] ; then
fi ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
fi fi
done done
...@@ -5344,9 +5344,9 @@ gui_dgvoodoo2 () { ...@@ -5344,9 +5344,9 @@ gui_dgvoodoo2 () {
ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%" ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%"
fi fi
done done
if [[ $CHECK_BOOLE_TRUE != 1 ]] ; then fi
ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%" if [[ $CHECK_BOOLE_TRUE != 1 ]] ; then
fi ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
fi fi
done done
......
...@@ -40,7 +40,8 @@ source "$PORT_SCRIPTS_PATH/functions_helper" ...@@ -40,7 +40,8 @@ source "$PORT_SCRIPTS_PATH/functions_helper"
export PW_START_PID="$$" export PW_START_PID="$$"
export NO_AT_BRIDGE="1" export NO_AT_BRIDGE="1"
export GDK_BACKEND="x11" export GDK_BACKEND="x11"
export pw_full_command_line=("$0" $*) IFS=' ' read -r -a pw_full_command_line <<< "$0 $*"
export pw_full_command_line
export orig_IFS="$IFS" export orig_IFS="$IFS"
MISSING_DESKTOP_FILE="0" MISSING_DESKTOP_FILE="0"
...@@ -392,7 +393,7 @@ case "$1" in ...@@ -392,7 +393,7 @@ case "$1" in
--debug) --debug)
clear clear
export PW_DEBUG="set -x" export PW_DEBUG="set -x"
/usr/bin/env bash -c ${pw_full_command_line[@]} 2>&1 | tee "$PORT_WINE_PATH/scripts-debug.log" & /usr/bin/env bash -c "${pw_full_command_line[@]}" 2>&1 | tee "$PORT_WINE_PATH/scripts-debug.log" &
exit 0 exit 0
;; ;;
--server-file-access) --server-file-access)
...@@ -411,7 +412,7 @@ case "$1" in ...@@ -411,7 +412,7 @@ case "$1" in
;; ;;
--edit-db) --edit-db)
# --edit-db /полный/путь/до/файла.exe PW_MANGOHUD=1 PW_VKBASALT=0 (и т.д) для примера # --edit-db /полный/путь/до/файла.exe PW_MANGOHUD=1 PW_VKBASALT=0 (и т.д) для примера
set_several_variables ${@:3} set_several_variables "${@:3}"
edit_db_from_gui $keys_all edit_db_from_gui $keys_all
exit 0 exit 0
;; ;;
...@@ -647,9 +648,9 @@ else ...@@ -647,9 +648,9 @@ else
done < "$PORT_WINE_TMP_PATH/statistics" done < "$PORT_WINE_TMP_PATH/statistics"
if [[ $SORT_WITH_TIME == enabled ]] && [[ ${line2[3]} == NEW_DESKTOP ]] ; then if [[ $SORT_WITH_TIME == enabled ]] && [[ ${line2[3]} == NEW_DESKTOP ]] ; then
sed -i "s/${line2[1]} ${line2[2]} NEW_DESKTOP/${line2[1]} ${line2[2]} OLD_DESKTOP/" "$PORT_WINE_TMP_PATH/statistics" sed -i "s/${line2[1]} ${line2[2]} NEW_DESKTOP/${line2[1]} ${line2[2]} OLD_DESKTOP/" "$PORT_WINE_TMP_PATH/statistics"
PW_AMOUNT_NEW_DESKTOP+=($AMOUNT_GENERATE_BUTTONS) IFS=' ' read -r -a PW_AMOUNT_NEW_DESKTOP <<< "${PW_AMOUNT_NEW_DESKTOP[*]} $AMOUNT_GENERATE_BUTTONS"
else else
PW_AMOUNT_OLD_DESKTOP+=($AMOUNT_GENERATE_BUTTONS) IFS=' ' read -r -a PW_AMOUNT_OLD_DESKTOP <<< "${PW_AMOUNT_OLD_DESKTOP[*]} $AMOUNT_GENERATE_BUTTONS"
fi fi
(( AMOUNT_GENERATE_BUTTONS++ )) (( AMOUNT_GENERATE_BUTTONS++ ))
fi fi
...@@ -775,14 +776,14 @@ else ...@@ -775,14 +776,14 @@ else
done < "$ai_file" done < "$ai_file"
AI_FILE="${ai_file//"$PORT_SCRIPTS_PATH/pw_autoinstall/"/}" AI_FILE="${ai_file//"$PORT_SCRIPTS_PATH/pw_autoinstall/"/}"
AI_FILE_CHECK="$AI_FILE=$AI_AMOUNT_ARRAY" AI_FILE_CHECK="$AI_FILE=$AI_AMOUNT_ARRAY"
AI_FILE_ARRAY+=($AI_FILE) IFS=' ' read -r -a AI_FILE_ARRAY <<< "${AI_FILE_ARRAY[*]} $AI_FILE"
if [[ $AI_TOP_GAMES =~ ${AI_FILE_CHECK//=*/} ]] ; then if [[ $AI_TOP_GAMES =~ ${AI_FILE_CHECK//=*/} ]] ; then
AI_TRUE_FILE+=($AI_FILE_CHECK) IFS=' ' read -r -a AI_TRUE_FILE <<< "${AI_TRUE_FILE[*]} $AI_FILE_CHECK"
else else
if [[ ${AI_NAME["$AI_AMOUNT_ARRAY"]} =~ \(ENG\) ]] ; then if [[ ${AI_NAME["$AI_AMOUNT_ARRAY"]} =~ \(ENG\) ]] ; then
AI_FILE_ENG+=($AI_AMOUNT_ARRAY) IFS=' ' read -r -a AI_FILE_ENG <<< "${AI_FILE_ENG[*]} $AI_AMOUNT_ARRAY"
else else
AI_FILE_UNSORTED+=($AI_AMOUNT_ARRAY) IFS=' ' read -r -a AI_FILE_UNSORTED <<< "${AI_FILE_UNSORTED[*]} $AI_AMOUNT_ARRAY"
fi fi
fi fi
(( AI_AMOUNT_ARRAY++ )) (( AI_AMOUNT_ARRAY++ ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment