forked from CastroFidel/winehelper
replace PP_ to WH_ in the naming variables
This commit is contained in:
Mikhail Tergoev
152
winehelper
152
winehelper
@ -29,14 +29,14 @@ else
|
||||
DATA_PATH="$(dirname "$RUN_SCRIPT")"
|
||||
fi
|
||||
|
||||
PP_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
|
||||
PP_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
|
||||
PP_DIST_DIR="$USER_WORK_PATH/dist"
|
||||
PP_TMP_DIR="$USER_WORK_PATH/tmp"
|
||||
WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
|
||||
WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
|
||||
WH_DIST_DIR="$USER_WORK_PATH/dist"
|
||||
WH_TMP_DIR="$USER_WORK_PATH/tmp"
|
||||
|
||||
PP_IMAGE_PATH="$DATA_PATH/image"
|
||||
PP_DB_DIR="$DATA_PATH/database"
|
||||
PP_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
||||
WH_IMAGE_PATH="$DATA_PATH/image"
|
||||
WH_DB_DIR="$DATA_PATH/database"
|
||||
WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
||||
|
||||
# export WINEDLLOVERRIDES=mshtml,mscoree="
|
||||
|
||||
@ -44,7 +44,7 @@ check_variables WINEESYNC "0"
|
||||
check_variables WINEFSYNC "0"
|
||||
|
||||
check_variables WINEARCH "win64" # or "win32"
|
||||
check_variables PP_WINE_USE "wine_x_tkg_10-0_amd64" # or system
|
||||
check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system
|
||||
|
||||
check_variables STAGING_SHARED_MEMORY "1"
|
||||
check_variables WINE_LARGE_ADDRESS_AWARE "1"
|
||||
@ -55,12 +55,12 @@ check_variables WINE_ALLOW_XIM "0"
|
||||
|
||||
check_variables DEBUG 0
|
||||
|
||||
check_variables PP_WINDOWS_VER "10"
|
||||
# check_variables PP_USE_GSTREAMER "1"
|
||||
# check_variables PP_USE_D3D_EXTRAS "1"
|
||||
check_variables PP_USE_SHADER_CACHE "1"
|
||||
check_variables PP_USE_WINE_DXGI "0"
|
||||
check_variables PP_DLL_INSTALL ""
|
||||
check_variables WH_WINDOWS_VER "10"
|
||||
# check_variables WH_USE_GSTREAMER "1"
|
||||
# check_variables WH_USE_D3D_EXTRAS "1"
|
||||
check_variables WH_USE_SHADER_CACHE "1"
|
||||
check_variables WH_USE_WINE_DXGI "0"
|
||||
check_variables WH_DLL_INSTALL ""
|
||||
|
||||
check_variables WINE_WIN_START "start /wait /high /unix"
|
||||
|
||||
@ -353,7 +353,7 @@ var_ld_library_path_update () {
|
||||
create_desktop () {
|
||||
local name_desktop="$1"
|
||||
local exe_file="$2"
|
||||
local icon_file="$PP_IMAGE_PATH/$3.png"
|
||||
local icon_file="$WH_IMAGE_PATH/$3.png"
|
||||
|
||||
if [[ -z "$name_desktop" ]] || [[ -z "$exe_file" ]] ; then
|
||||
fatal "Used: $0 --desktop \"desktop_name\" \"path_to_exe\" \"name_png_from_image\""
|
||||
@ -381,7 +381,7 @@ create_desktop () {
|
||||
if [[ "$USE_AI_SCRIPTS" == "1" ]] \
|
||||
&& [[ -f "$exe_file" ]]
|
||||
then
|
||||
grep -e "#!" -e "export" -e "var_" "$PP_AUTOINSTALL_DIR/$AI_SCRIPT" \
|
||||
grep -e "#!" -e "export" -e "var_" "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" \
|
||||
| grep -vE "LAUNCH_PARAMETERS|AUTOINSTALL|WIN_FILE_EXEC|echo" \
|
||||
| awk '{$1=$1;print}' > "$exe_file".ppdb
|
||||
print_info "Создан файл настроек для $exe_file"
|
||||
@ -410,9 +410,9 @@ init_dxvk () {
|
||||
|
||||
get_dxvk () {
|
||||
DXVK_URL="$1"
|
||||
DXVK_PACKAGE="${PP_VULKAN_LIBDIR}/dxvk-${DXVK_VAR_VER}.tar.$(echo ${DXVK_URL#*.tar.})"
|
||||
DXVK_PACKAGE="${WH_VULKAN_LIBDIR}/dxvk-${DXVK_VAR_VER}.tar.$(echo ${DXVK_URL#*.tar.})"
|
||||
if try_download "$DXVK_URL" "$DXVK_PACKAGE" check256sum \
|
||||
&& unpack "$DXVK_PACKAGE" "$PP_VULKAN_LIBDIR"
|
||||
&& unpack "$DXVK_PACKAGE" "$WH_VULKAN_LIBDIR"
|
||||
then
|
||||
try_remove_file "$DXVK_PACKAGE"
|
||||
return 0
|
||||
@ -421,12 +421,12 @@ init_dxvk () {
|
||||
}
|
||||
|
||||
for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
|
||||
if [[ ! -d "${PP_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
|
||||
if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
|
||||
get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.gz"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ "${PP_USE_WINE_DXGI}" == 1 ]] ; then
|
||||
if [[ "${WH_USE_WINE_DXGI}" == 1 ]] ; then
|
||||
DXVK_FILES="d3d9 d3d10_1 d3d10 d3d11" # dxvk_config openvr_api_dxvk"
|
||||
try_copy_wine_dll_to_pfx_64 "dxgi.dll"
|
||||
try_copy_wine_dll_to_pfx_32 "dxgi.dll"
|
||||
@ -435,8 +435,8 @@ init_dxvk () {
|
||||
fi
|
||||
|
||||
for dxvkfiles in $DXVK_FILES ; do
|
||||
try_copy_other_dll_to_pfx_64 "${PP_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x64/$dxvkfiles.dll"
|
||||
if try_copy_other_dll_to_pfx_32 "${PP_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x32/$dxvkfiles.dll"
|
||||
try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x64/$dxvkfiles.dll"
|
||||
if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x32/$dxvkfiles.dll"
|
||||
then var_winedlloverride_update "$dxvkfiles=n"
|
||||
fi
|
||||
done
|
||||
@ -447,9 +447,9 @@ init_vkd3d () {
|
||||
|
||||
get_vkd3d () {
|
||||
VKD3D_URL="$1"
|
||||
VKD3D_PACKAGE="${PP_VULKAN_LIBDIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.$(echo ${VKD3D_URL#*.tar.})"
|
||||
VKD3D_PACKAGE="${WH_VULKAN_LIBDIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.$(echo ${VKD3D_URL#*.tar.})"
|
||||
if try_download "$VKD3D_URL" "$VKD3D_PACKAGE" check256sum \
|
||||
&& unpack "$VKD3D_PACKAGE" "$PP_VULKAN_LIBDIR"
|
||||
&& unpack "$VKD3D_PACKAGE" "$WH_VULKAN_LIBDIR"
|
||||
then
|
||||
try_remove_file "$VKD3D_PACKAGE"
|
||||
return 0
|
||||
@ -458,15 +458,15 @@ init_vkd3d () {
|
||||
}
|
||||
|
||||
for VKD3D_VAR_VER in "$USE_VKD3D_VER" $@ ; do
|
||||
if [[ ! -d "${PP_VULKAN_LIBDIR}/vkd3d-proton-$VKD3D_VAR_VER" ]] ; then
|
||||
if [[ ! -d "${WH_VULKAN_LIBDIR}/vkd3d-proton-$VKD3D_VAR_VER" ]] ; then
|
||||
get_vkd3d "$CLOUD_URL/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz"
|
||||
fi
|
||||
done
|
||||
|
||||
VKD3D_FILES="d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1" # libvkd3d-proton-utils-3
|
||||
for vkd3dfiles in $VKD3D_FILES ; do
|
||||
try_copy_other_dll_to_pfx_64 "${PP_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x64/$vkd3dfiles.dll"
|
||||
if try_copy_other_dll_to_pfx_32 "${PP_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x86/$vkd3dfiles.dll"
|
||||
try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x64/$vkd3dfiles.dll"
|
||||
if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x86/$vkd3dfiles.dll"
|
||||
then var_winedlloverride_update "$vkd3dfiles=n"
|
||||
fi
|
||||
done
|
||||
@ -474,12 +474,12 @@ init_vkd3d () {
|
||||
|
||||
##### DOWNLOAD WINE #####
|
||||
download_wine () {
|
||||
if [[ ! -d "$PP_DIST_DIR/$PP_WINE_USE" ]] ; then
|
||||
WINE_URL="$CLOUD_URL/$PP_WINE_USE.tar.xz"
|
||||
local WINE_PACKAGE="$PP_TMP_DIR/${PP_WINE_USE}.tar.xz"
|
||||
if [[ ! -d "$WH_DIST_DIR/$WH_WINE_USE" ]] ; then
|
||||
WINE_URL="$CLOUD_URL/$WH_WINE_USE.tar.xz"
|
||||
local WINE_PACKAGE="$WH_TMP_DIR/${WH_WINE_USE}.tar.xz"
|
||||
if try_download "$WINE_URL" "$WINE_PACKAGE" check256sum ; then
|
||||
if unpack "$WINE_PACKAGE" "$PP_DIST_DIR/" ; then
|
||||
echo "$PP_WINE_USE" > "$PP_DIST_DIR/$PP_WINE_USE/version"
|
||||
if unpack "$WINE_PACKAGE" "$WH_DIST_DIR/" ; then
|
||||
echo "$WH_WINE_USE" > "$WH_DIST_DIR/$WH_WINE_USE/version"
|
||||
try_remove_file "$WINE_PACKAGE"
|
||||
fi
|
||||
fi
|
||||
@ -488,8 +488,8 @@ download_wine () {
|
||||
|
||||
##### INITIAL WINE SETTINGS #####
|
||||
init_wine_ver () {
|
||||
if [[ "$PP_WINE_USE" != system* ]] ; then
|
||||
export WINEDIR="$PP_DIST_DIR/$PP_WINE_USE"
|
||||
if [[ "$WH_WINE_USE" != system* ]] ; then
|
||||
export WINEDIR="$WH_DIST_DIR/$WH_WINE_USE"
|
||||
|
||||
if [[ ! -d "$WINEDIR" ]] ; then
|
||||
download_wine
|
||||
@ -523,7 +523,7 @@ init_wine_ver () {
|
||||
fi
|
||||
fi
|
||||
|
||||
[[ ! -f "${WINEDIR}/version" ]] && echo "${PP_WINE_USE}" > "${WINEDIR}/version"
|
||||
[[ ! -f "${WINEDIR}/version" ]] && echo "${WH_WINE_USE}" > "${WINEDIR}/version"
|
||||
|
||||
if [[ ! -d "${WINEDIR}/lib64/" ]] && [[ -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then
|
||||
create_new_dir "${WINEDIR}/lib64/wine"
|
||||
@ -548,7 +548,7 @@ init_wine_ver () {
|
||||
check_variables DXVK_LOG_PATH "none"
|
||||
check_variables VKBASALT_LOG_LEVEL "none"
|
||||
check_variables DXVK_NVAPI_LOG_LEVEL "none"
|
||||
export PP_WDBG='2>/dev/null'
|
||||
export WH_WDBG='2>/dev/null'
|
||||
else
|
||||
# check_variables WINEDEBUG "fixme-all,err+loaddll,err+dll,err+file,err+reg,warn+file"
|
||||
check_variables WINEDEBUG "+loaddll,+seh"
|
||||
@ -558,10 +558,10 @@ init_wine_ver () {
|
||||
check_variables VK_LOADER_DEBUG "error"
|
||||
check_variables VKBASALT_LOG_LEVEL "error"
|
||||
check_variables DXVK_NVAPI_LOG_LEVEL "error"
|
||||
export PP_WDBG=""
|
||||
export WH_WDBG=""
|
||||
fi
|
||||
|
||||
print_info "Используется версия wine: $PP_WINE_USE"
|
||||
print_info "Используется версия wine: $WH_WINE_USE"
|
||||
}
|
||||
|
||||
##### INITIAL WINEPREFIX SETTINGS #####
|
||||
@ -576,7 +576,7 @@ wait_wineserver () {
|
||||
get_base_pfx () {
|
||||
local FILE_NAME_PFX="$1"
|
||||
local PFX_URL="$CLOUD_URL/${FILE_NAME_PFX}.tar.xz"
|
||||
local PFX_TMP="$PP_TMP_DIR/pfx"
|
||||
local PFX_TMP="$WH_TMP_DIR/pfx"
|
||||
create_new_dir "$PFX_TMP"
|
||||
|
||||
if [[ ! -f "$PFX_TMP/$FILE_NAME_PFX.tar.xz" ]] ; then
|
||||
@ -595,10 +595,10 @@ get_base_pfx () {
|
||||
|
||||
init_wineprefix () {
|
||||
if [[ -z "$WINEPREFIX" ]] ; then
|
||||
export WINEPREFIX="$PP_PREFIXES_DIR/default"
|
||||
export WINEPREFIX="$WH_PREFIXES_DIR/default"
|
||||
else
|
||||
if echo "$WINEPREFIX" | grep -v '/' ; then
|
||||
export WINEPREFIX="$PP_PREFIXES_DIR/$WINEPREFIX"
|
||||
export WINEPREFIX="$WH_PREFIXES_DIR/$WINEPREFIX"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -622,15 +622,15 @@ init_wineprefix () {
|
||||
fi
|
||||
|
||||
if [[ -f "$WINEPREFIX/system.reg" ]] \
|
||||
&& [[ -z $(grep "Windows $PP_WINDOWS_VER" "$WINEPREFIX/system.reg") ]]
|
||||
&& [[ -z $(grep "Windows $WH_WINDOWS_VER" "$WINEPREFIX/system.reg") ]]
|
||||
then
|
||||
if [[ $(echo "$PP_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]] \
|
||||
if [[ $(echo "$WH_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]] \
|
||||
&& [[ "$WINEARCH" != "win32" ]]
|
||||
then export PP_WINDOWS_VER="xp64"
|
||||
then export WH_WINDOWS_VER="xp64"
|
||||
fi
|
||||
env WINEDLLOVERRIDES="winegstreamer=" "$WINELOADER" winecfg -v $(echo "win${PP_WINDOWS_VER}" | sed 's/.*/\L&/')
|
||||
env WINEDLLOVERRIDES="winegstreamer=" "$WINELOADER" winecfg -v $(echo "win${WH_WINDOWS_VER}" | sed 's/.*/\L&/')
|
||||
wait_wineserver
|
||||
print_info "Windows версия изменена на win${PP_WINDOWS_VER}"
|
||||
print_info "Windows версия изменена на win${WH_WINDOWS_VER}"
|
||||
fi
|
||||
|
||||
if [[ -d "$DRIVE_C/users/xuser" ]] && [[ ! -d "$DRIVE_C/users/$USER" ]]
|
||||
@ -645,48 +645,48 @@ update_winetricks () {
|
||||
W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
|
||||
W_TRX_EXT_VER="$(curl -s --list-only "$W_TRX_URL" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
|
||||
print_info "Актуальная версия winetricks: $W_TRX_EXT_VER"
|
||||
if [[ -f "$PP_TMP_DIR/winetricks" ]] ; then
|
||||
W_TRX_INT_VER="$(cat "$PP_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
|
||||
if [[ -f "$WH_TMP_DIR/winetricks" ]] ; then
|
||||
W_TRX_INT_VER="$(cat "$WH_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
|
||||
print_info "Установленная портативная версия winetricks: $W_TRX_INT_VER"
|
||||
fi
|
||||
if [[ -n "$W_TRX_EXT_VER" ]] && [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ]] ; then
|
||||
if try_download "$W_TRX_URL" "$PP_TMP_DIR/winetricks_new" ; then
|
||||
mv -f "$PP_TMP_DIR/winetricks_new" "$PP_TMP_DIR/winetricks"
|
||||
W_TRX_INT_VER="$(cat "$PP_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/_VERSION=//')"
|
||||
if try_download "$W_TRX_URL" "$WH_TMP_DIR/winetricks_new" ; then
|
||||
mv -f "$WH_TMP_DIR/winetricks_new" "$WH_TMP_DIR/winetricks"
|
||||
W_TRX_INT_VER="$(cat "$WH_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/_VERSION=//')"
|
||||
print_info "Портативная версия winetricks обновлена до (${W_TRX_INT_VER})"
|
||||
chmod u+x "$PP_TMP_DIR/winetricks"
|
||||
chmod u+x "$WH_TMP_DIR/winetricks"
|
||||
fi
|
||||
fi
|
||||
export WINETRICKS="$PP_TMP_DIR/winetricks"
|
||||
export WINETRICKS="$WH_TMP_DIR/winetricks"
|
||||
}
|
||||
|
||||
use_winetricks () {
|
||||
if [[ -n "$INSTALL_DLL" ]] ; then
|
||||
PP_DLL_INSTALL="$(echo "$INSTALL_DLL $PP_DLL_INSTALL" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' )"
|
||||
WH_DLL_INSTALL="$(echo "$INSTALL_DLL $WH_DLL_INSTALL" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' )"
|
||||
fi
|
||||
if [[ -n "$PP_DLL_INSTALL" ]] ; then
|
||||
PP_DLL_NEED_INSTALL=""
|
||||
if [[ -n "$WH_DLL_INSTALL" ]] ; then
|
||||
WH_DLL_NEED_INSTALL=""
|
||||
USE_WT_FROM_DB=0
|
||||
[[ ! -f "$WINEPREFIX/winetricks.log" ]] && touch "$WINEPREFIX/winetricks.log"
|
||||
for need_install_dll_to_pfx in $PP_DLL_INSTALL "isolate_home" ; do
|
||||
for need_install_dll_to_pfx in $WH_DLL_INSTALL "isolate_home" ; do
|
||||
if [[ "$need_install_dll_to_pfx" == vcrun201[5-9] ]] ; then
|
||||
sed -i "/${need_install_dll_to_pfx}/d" "$WINEPREFIX/winetricks.log"
|
||||
need_install_dll_to_pfx="vcrun2022"
|
||||
fi
|
||||
if ! grep "$need_install_dll_to_pfx" "$WINEPREFIX/winetricks.log" &>/dev/null ; then
|
||||
if [[ -z "$PP_DLL_NEED_INSTALL" ]]
|
||||
then PP_DLL_NEED_INSTALL="$need_install_dll_to_pfx"
|
||||
else PP_DLL_NEED_INSTALL="$need_install_dll_to_pfx $PP_DLL_NEED_INSTALL"
|
||||
if [[ -z "$WH_DLL_NEED_INSTALL" ]]
|
||||
then WH_DLL_NEED_INSTALL="$need_install_dll_to_pfx"
|
||||
else WH_DLL_NEED_INSTALL="$need_install_dll_to_pfx $WH_DLL_NEED_INSTALL"
|
||||
fi
|
||||
USE_WT_FROM_DB=1
|
||||
fi
|
||||
done
|
||||
if [[ "$USE_WT_FROM_DB" == "1" ]] ; then
|
||||
if update_winetricks ; then
|
||||
print_info "Пробуем установить библиотеки: ${PP_DLL_NEED_INSTALL}"
|
||||
print_info "Пробуем установить библиотеки: ${WH_DLL_NEED_INSTALL}"
|
||||
print_info "Запускаем WINETRICKS..."
|
||||
export WINETRICKS_DOWNLOADER="curl"
|
||||
env WINEDLLOVERRIDES="winegstreamer=" "$PP_TMP_DIR/winetricks" -q ${PP_DLL_NEED_INSTALL}
|
||||
env WINEDLLOVERRIDES="winegstreamer=" "$WH_TMP_DIR/winetricks" -q ${WH_DLL_NEED_INSTALL}
|
||||
wait_wineserver
|
||||
fi
|
||||
fi
|
||||
@ -711,12 +711,12 @@ init_database () {
|
||||
else
|
||||
orig_IFS="$IFS"
|
||||
IFS=$'\n'
|
||||
PP_FIND_DB_FILE="$(grep -ilw "#$PPDB.exe" "$PP_DB_DIR"/* )"
|
||||
if [[ $(echo "$PP_FIND_DB_FILE" | wc -l) -gt 1 ]] ; then
|
||||
WH_FIND_DB_FILE="$(grep -ilw "#$PPDB.exe" "$WH_DB_DIR"/* )"
|
||||
if [[ $(echo "$WH_FIND_DB_FILE" | wc -l) -gt 1 ]] ; then
|
||||
print_error "Найдено более одного файла настроек: $PPDB.exe"
|
||||
PPDB_FILE="$(echo "$PP_FIND_DB_FILE" | head -n1)"
|
||||
PPDB_FILE="$(echo "$WH_FIND_DB_FILE" | head -n1)"
|
||||
else
|
||||
PPDB_FILE="$PP_FIND_DB_FILE"
|
||||
PPDB_FILE="$WH_FIND_DB_FILE"
|
||||
fi
|
||||
IFS="$orig_IFS"
|
||||
fi
|
||||
@ -748,7 +748,7 @@ prepair_wine () {
|
||||
}
|
||||
|
||||
wine_run () {
|
||||
print_var WINEPREFIX WINEDLLOVERRIDES PP_WINDOWS_VER
|
||||
print_var WINEPREFIX WINEDLLOVERRIDES WH_WINDOWS_VER
|
||||
WIN_FILE_PATH="$(dirname "$WIN_FILE_EXEC")"
|
||||
[[ -d "$WIN_FILE_PATH" ]] && cd "$WIN_FILE_PATH"
|
||||
|
||||
@ -770,16 +770,16 @@ run_autoinstall () {
|
||||
AI_SCRIPT="${1,,}"
|
||||
if [[ $AI_SCRIPT == "list" ]] || [[ -z "$AI_SCRIPT" ]] ; then
|
||||
print_info "Список программ с возможностью автоматической установки:"
|
||||
for list in $(ls "$PP_AUTOINSTALL_DIR") ; do
|
||||
AI_INFO="$(grep "info_ru:" "$PP_AUTOINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
|
||||
AI_PROGNAME="$(grep "PROG_NAME=" "$PP_AUTOINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
|
||||
for list in $(ls "$WH_AUTOINSTALL_DIR") ; do
|
||||
AI_INFO="$(grep "info_ru:" "$WH_AUTOINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
|
||||
AI_PROGNAME="$(grep "PROG_NAME=" "$WH_AUTOINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
|
||||
printf "\E[36m%s $SCRIPT_NAME install $list - $AI_PROGNAME %s\e[0m\n"
|
||||
echo -e "$AI_INFO\n"
|
||||
done
|
||||
echo
|
||||
elif [[ -f "$PP_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
|
||||
elif [[ -f "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
|
||||
export USE_AI_SCRIPTS="1"
|
||||
source "$PP_AUTOINSTALL_DIR/$AI_SCRIPT"
|
||||
source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT"
|
||||
print_info "Завершена установка $AI_SCRIPT"
|
||||
else
|
||||
fatal "Скрипт автоматической установки для $AI_SCRIPT не найден!"
|
||||
@ -787,10 +787,10 @@ run_autoinstall () {
|
||||
}
|
||||
|
||||
##### MAIN #####
|
||||
create_new_dir "$PP_TMP_DIR"
|
||||
create_new_dir "$PP_DIST_DIR"
|
||||
create_new_dir "$PP_PREFIXES_DIR"
|
||||
create_new_dir "$PP_VULKAN_LIBDIR"
|
||||
create_new_dir "$WH_TMP_DIR"
|
||||
create_new_dir "$WH_DIST_DIR"
|
||||
create_new_dir "$WH_PREFIXES_DIR"
|
||||
create_new_dir "$WH_VULKAN_LIBDIR"
|
||||
|
||||
case "${1,,}" in
|
||||
killall) kill_wine ;;
|
||||
|
||||
Reference in New Issue
Block a user