rename var: INSTALL_MODE -> WH_INSTALL_MODE
This commit is contained in:
16
winehelper
16
winehelper
@@ -1282,7 +1282,8 @@ init_wineprefix () {
|
|||||||
echo "# переменные последнего использования префикса:" > "$WINEPREFIX/last.conf"
|
echo "# переменные последнего использования префикса:" > "$WINEPREFIX/last.conf"
|
||||||
for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
|
for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
|
||||||
STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
|
STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
|
||||||
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_MESA_GL_OVERRIDE
|
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_MESA_GL_OVERRIDE \
|
||||||
|
WH_USE_CPCSP_PROXY
|
||||||
do
|
do
|
||||||
echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
|
echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
|
||||||
done
|
done
|
||||||
@@ -1442,9 +1443,10 @@ wine_run () {
|
|||||||
|
|
||||||
wine_run_install () {
|
wine_run_install () {
|
||||||
print_info "Запускаем установку: $1."
|
print_info "Запускаем установку: $1."
|
||||||
if [[ "$INSTALL_MODE" == "manual" ]]
|
case "$WH_INSTALL_MODE" in
|
||||||
then print_warning "Рекомендуется не менять пути для установки приложения!"
|
"manual") print_warning "Рекомендуется не менять пути для установки приложения!" ;;
|
||||||
fi
|
"test") print_warning "Установка приложения из списка экспериментальных скриптов." ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [[ ! -f "$1" ]]
|
if [[ ! -f "$1" ]]
|
||||||
then fatal "Нет файла для установки: $1"
|
then fatal "Нет файла для установки: $1"
|
||||||
@@ -1467,15 +1469,13 @@ run_autoinstall () {
|
|||||||
elif [[ -f "$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]] ; then
|
elif [[ -f "$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]] ; then
|
||||||
INSTALL_SCRIPT="$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
INSTALL_SCRIPT="$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
||||||
WH_INSTALL_MODE="manual"
|
WH_INSTALL_MODE="manual"
|
||||||
elif [[ -d "$WH_TESTINSTALL_DIR" ]] \
|
elif [[ -f "$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]] ; then
|
||||||
&& [[ -f "$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]]
|
|
||||||
then
|
|
||||||
INSTALL_SCRIPT="$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
INSTALL_SCRIPT="$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
||||||
WH_INSTALL_MODE="test"
|
WH_INSTALL_MODE="test"
|
||||||
else
|
else
|
||||||
INSTALL_SCRIPT="0"
|
INSTALL_SCRIPT="0"
|
||||||
fi
|
fi
|
||||||
export INSTALL_SCRIPT INSTALL_MODE
|
export INSTALL_SCRIPT WH_INSTALL_MODE
|
||||||
|
|
||||||
if [[ $INSTALL_SCRIPT_NAME == "list" ]] || [[ -z "$INSTALL_SCRIPT_NAME" ]] ; then
|
if [[ $INSTALL_SCRIPT_NAME == "list" ]] || [[ -z "$INSTALL_SCRIPT_NAME" ]] ; then
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user