Skip to content

P
PortWINE
Commit f17da814 authored by Vladislav's avatar Vladislav
Browse files
Options

SKIP_CHECK_UPDATES=1 is exported once

parent 40cb9519
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 27 deletions
data_from_portwine/scripts/functions_helper
View file @ f17da814
...@@ -685,7 +685,7 @@ pw_reinstall_pp () { ...@@ -685,7 +685,7 @@ pw_reinstall_pp () {
try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver" try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver"
echo echo
print_info "Restarting PP for reinstall files..." print_info "Restarting PP for reinstall files..."
export SKIP_CHECK_UPDATES="0" unset SKIP_CHECK_UPDATES
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
} }
...@@ -1811,7 +1811,6 @@ pw_find_exe () { ...@@ -1811,7 +1811,6 @@ pw_find_exe () {
YAD_STATUS="$?" YAD_STATUS="$?"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
if [[ -z "${PW_SET_FIND_EXE}" ]] ; then if [[ -z "${PW_SET_FIND_EXE}" ]] ; then
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
print_info "Restarting..." print_info "Restarting..."
fi fi
...@@ -1822,7 +1821,6 @@ pw_find_exe () { ...@@ -1822,7 +1821,6 @@ pw_find_exe () {
if [[ ! -z "${PW_SET_FIND_EXE}" ]] ; then if [[ ! -z "${PW_SET_FIND_EXE}" ]] ; then
portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')" portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')"
portwine_create_shortcut silent portwine_create_shortcut silent
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -3418,7 +3416,6 @@ open_changelog () { ...@@ -3418,7 +3416,6 @@ open_changelog () {
else else
export TAB_MAIN_MENU="5" export TAB_MAIN_MENU="5"
fi fi
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
print_info "Restarting..." print_info "Restarting..."
exit 0 exit 0
...@@ -3554,7 +3551,6 @@ gui_proton_downloader () { ...@@ -3554,7 +3551,6 @@ gui_proton_downloader () {
if [[ -z "${PROTON_PW_GIT}" ]] ; then if [[ -z "${PROTON_PW_GIT}" ]] ; then
yad_error "$(gettext "Error: check wine.")" yad_error "$(gettext "Error: check wine.")"
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -3633,7 +3629,6 @@ gui_proton_downloader () { ...@@ -3633,7 +3629,6 @@ gui_proton_downloader () {
--button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 2>/dev/null --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 2>/dev/null
YAD_WINE_STATUS="$?" YAD_WINE_STATUS="$?"
if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -3648,7 +3643,6 @@ gui_proton_downloader () { ...@@ -3648,7 +3643,6 @@ gui_proton_downloader () {
&& [[ -z "${VERSION_INSTALLED_WINE}" ]] && [[ -z "${VERSION_INSTALLED_WINE}" ]]
then then
print_info "Nothing to do." print_info "Nothing to do."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -3692,7 +3686,6 @@ gui_proton_downloader () { ...@@ -3692,7 +3686,6 @@ gui_proton_downloader () {
try_remove_dir "${PORT_WINE_PATH}/data/dist/${REMOVE_WINE}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${REMOVE_WINE}"
done done
if [[ -z "${VERSION_WINE_GIT}" ]] ; then if [[ -z "${VERSION_WINE_GIT}" ]] ; then
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -3708,7 +3701,6 @@ gui_proton_downloader () { ...@@ -3708,7 +3701,6 @@ gui_proton_downloader () {
done done
pw_download_get_wine pw_download_get_wine
done done
export SKIP_CHECK_UPDATES="1"
edit_db_from_gui edit_db_from_gui
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
...@@ -3896,7 +3888,6 @@ A brief instruction: ...@@ -3896,7 +3888,6 @@ A brief instruction:
--button="$(gettext "OPEN THE SETTINGS FILE")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Open the <b>.ppdb</b> settings file in a system text editor to view and change variables manually")":150 \ --button="$(gettext "OPEN THE SETTINGS FILE")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Open the <b>.ppdb</b> settings file in a system text editor to view and change variables manually")":150 \
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":0 2>/dev/null --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":0 2>/dev/null
YAD_STATUS="$?" YAD_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "$YAD_STATUS" in case "$YAD_STATUS" in
1|252) 1|252)
...@@ -4072,7 +4063,6 @@ fi ...@@ -4072,7 +4063,6 @@ fi
--button="$(gettext "DISABLE") VKBASALT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable vkBasalt and go to the previous menu")":180 \ --button="$(gettext "DISABLE") VKBASALT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable vkBasalt and go to the previous menu")":180 \
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":182 2>/dev/null --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":182 2>/dev/null
YAD_VKBASALT_STATUS="$?" YAD_VKBASALT_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "${YAD_VKBASALT_STATUS}" in case "${YAD_VKBASALT_STATUS}" in
1|252) 1|252)
...@@ -4241,7 +4231,6 @@ fi ...@@ -4241,7 +4231,6 @@ fi
--button="$(gettext "DISABLE") MANGOHUD"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable MangoHud and go to the previous menu")":182 \ --button="$(gettext "DISABLE") MANGOHUD"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable MangoHud and go to the previous menu")":182 \
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":186 2>/dev/null --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":186 2>/dev/null
YAD_MANGOHUD_STATUS="$?" YAD_MANGOHUD_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "${YAD_MANGOHUD_STATUS}" in case "${YAD_MANGOHUD_STATUS}" in
1|252) 1|252)
...@@ -4446,7 +4435,6 @@ fi ...@@ -4446,7 +4435,6 @@ fi
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \ --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \
2>/dev/null 2>/dev/null
YAD_DGV2_STATUS="$?" YAD_DGV2_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "${YAD_DGV2_STATUS}" in case "${YAD_DGV2_STATUS}" in
1|252) 1|252)
...@@ -4645,7 +4633,6 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate." ...@@ -4645,7 +4633,6 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate."
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \ --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \
2>/dev/null 2>/dev/null
YAD_GAMESCOPE_STATUS="$?" YAD_GAMESCOPE_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "${YAD_GAMESCOPE_STATUS}" in case "${YAD_GAMESCOPE_STATUS}" in
1|252) 1|252)
...@@ -4775,7 +4762,6 @@ gui_userconf () { ...@@ -4775,7 +4762,6 @@ gui_userconf () {
--button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \ --button="$(gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Save the current changes, and go to the previous menu")":166 \
2>/dev/null 2>/dev/null
YAD_USERCONF_STATUS="$?" YAD_USERCONF_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "$YAD_USERCONF_STATUS" in case "$YAD_USERCONF_STATUS" in
1|252) 1|252)
...@@ -4986,7 +4972,6 @@ portwine_create_shortcut () { ...@@ -4986,7 +4972,6 @@ portwine_create_shortcut () {
if [[ "$PW_NO_RESTART_PPDB" != "1" ]] ; then if [[ "$PW_NO_RESTART_PPDB" != "1" ]] ; then
print_info "Restarting PP..." print_info "Restarting PP..."
unset PW_YAD_FORM_TAB unset PW_YAD_FORM_TAB
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -5436,7 +5421,7 @@ pw_create_prefix_backup () { ...@@ -5436,7 +5421,7 @@ pw_create_prefix_backup () {
--button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ --button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \
--button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null) --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
YAD_STATUS="$?" YAD_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
...@@ -5527,7 +5512,6 @@ run_desktop_b_click () { ...@@ -5527,7 +5512,6 @@ run_desktop_b_click () {
print_info "Restarting PP after choose desktop file..." print_info "Restarting PP after choose desktop file..."
# stop_portwine # stop_portwine
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP}" & /usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP}" &
exit 0 exit 0
} }
...@@ -5542,7 +5526,6 @@ gui_clear_pfx () { ...@@ -5542,7 +5526,6 @@ gui_clear_pfx () {
if yad_question "$(gettext "Do you want to clear prefix in PortProton?")" ; then if yad_question "$(gettext "Do you want to clear prefix in PortProton?")" ; then
pw_clear_pfx pw_clear_pfx
print_info "Restarting PP after clearing prefix..." print_info "Restarting PP after clearing prefix..."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
...@@ -5569,7 +5552,7 @@ gui_pw_update () { ...@@ -5569,7 +5552,7 @@ gui_pw_update () {
fi fi
try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
print_info "Restarting PP for check update..." print_info "Restarting PP for check update..."
export SKIP_CHECK_UPDATES="0" unset SKIP_CHECK_UPDATES
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
} }
...@@ -5583,7 +5566,6 @@ change_loc () { ...@@ -5583,7 +5566,6 @@ change_loc () {
fi fi
try_remove_file "${PORT_WINE_TMP_PATH}/PortProton_loc" try_remove_file "${PORT_WINE_TMP_PATH}/PortProton_loc"
print_info "Restarting PP for change language..." print_info "Restarting PP for change language..."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
} }
...@@ -5600,7 +5582,6 @@ change_mirror () { ...@@ -5600,7 +5582,6 @@ change_mirror () {
"$(gettext "Mirror changed to:")" "<b>https://cloud.linux-gaming.ru</b>" "$(gettext "Mirror changed to:")" "<b>https://cloud.linux-gaming.ru</b>"
fi fi
print_info "Restarting PP for change mirror..." print_info "Restarting PP for change mirror..."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" & /usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" &
exit 0 exit 0
} }
...@@ -5634,7 +5615,6 @@ change_download_grid () { ...@@ -5634,7 +5615,6 @@ change_download_grid () {
"$(gettext "Cover downloads are enabled")" "$(gettext "Cover downloads are enabled")"
fi fi
print_info "Restarting PP for change cover download behavior..." print_info "Restarting PP for change cover download behavior..."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" & /usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" &
exit 0 exit 0
} }
...@@ -5651,7 +5631,6 @@ change_gui_start () { ...@@ -5651,7 +5631,6 @@ change_gui_start () {
"$(gettext "Gui start changed to:")" "<b>NOTEBOOK</b>" "$(gettext "Gui start changed to:")" "<b>NOTEBOOK</b>"
fi fi
print_info "Restarting PP for change gui start..." print_info "Restarting PP for change gui start..."
export SKIP_CHECK_UPDATES="1"
/usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" & /usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" &
exit 0 exit 0
} }
...@@ -5671,7 +5650,6 @@ gui_open_user_conf () { ...@@ -5671,7 +5650,6 @@ gui_open_user_conf () {
--button="$(gettext "SAVE")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":2 \ --button="$(gettext "SAVE")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":2 \
--filename="${PORT_WINE_PATH}/data/user.conf" 2>/dev/null)" --filename="${PORT_WINE_PATH}/data/user.conf" 2>/dev/null)"
YAD_STATUS="$?" YAD_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
case "${YAD_STATUS}" in case "${YAD_STATUS}" in
1|252) 1|252)
...@@ -5721,7 +5699,7 @@ gui_open_scripts_from_backup () { ...@@ -5721,7 +5699,7 @@ gui_open_scripts_from_backup () {
PW_SCRIPT_FROM_BACKUP=$("${pw_yad}" --file --width=650 --height=500 \ PW_SCRIPT_FROM_BACKUP=$("${pw_yad}" --file --width=650 --height=500 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null ) --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null )
YAD_STATUS="$?" YAD_STATUS="$?"
export SKIP_CHECK_UPDATES="1"
if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
......
data_from_portwine/scripts/start.sh
View file @ f17da814
...@@ -403,6 +403,8 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then ...@@ -403,6 +403,8 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
fi fi
fi fi
export SKIP_CHECK_UPDATES="1"
[[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut
if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then
...@@ -659,7 +661,6 @@ if [[ -f "${portwine_exe}" ]] ; then ...@@ -659,7 +661,6 @@ if [[ -f "${portwine_exe}" ]] ; then
unset PW_YAD_FORM_TAB unset PW_YAD_FORM_TAB
fi fi
unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB KEY_START portwine_exe unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB KEY_START portwine_exe
export SKIP_CHECK_UPDATES=1
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
print_info "Restarting..." print_info "Restarting..."
exit 0 exit 0
......
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