From 546a087dbe80f14925316fb907b4784d3f8b7e87 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 1 Feb 2025 16:40:14 +0300 Subject: [PATCH] autoinstall: disabled create desktop file ctmbar.exe for all wed --- autoinstall/wed-alf | 14 ++++++++------ autoinstall/wed-control | 14 ++++++++------ autoinstall/wed-dcl | 14 ++++++++------ autoinstall/wed-info | 14 ++++++++------ autoinstall/wed-pa | 14 ++++++++------ autoinstall/wed-sts | 14 ++++++++------ 6 files changed, 48 insertions(+), 36 deletions(-) diff --git a/autoinstall/wed-alf b/autoinstall/wed-alf index 6cf5f4b..9f37ec2 100644 --- a/autoinstall/wed-alf +++ b/autoinstall/wed-alf @@ -27,11 +27,13 @@ if try_download "https://ftp.ctm.ru/ALPHABET/SFX/setup_al.exe" "${AUTOINSTALL_EX WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/ALPHABET/alf.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi diff --git a/autoinstall/wed-control b/autoinstall/wed-control index 0ebc56a..8aa05ce 100644 --- a/autoinstall/wed-control +++ b/autoinstall/wed-control @@ -27,11 +27,13 @@ if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/CONTROL/Control.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi diff --git a/autoinstall/wed-dcl b/autoinstall/wed-dcl index ae04889..63a772f 100644 --- a/autoinstall/wed-dcl +++ b/autoinstall/wed-dcl @@ -27,11 +27,13 @@ if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_EXE}" ; WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/DCL/DCL.EXE" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "weddcl" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi diff --git a/autoinstall/wed-info b/autoinstall/wed-info index 05638f7..1a6ac4a 100644 --- a/autoinstall/wed-info +++ b/autoinstall/wed-info @@ -27,11 +27,13 @@ if try_download "https://ftp.ctm.ru/VEDINFO/SFX/setup_vi.exe" "${AUTOINSTALL_EXE WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/VED_INFO/ved_info.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi diff --git a/autoinstall/wed-pa b/autoinstall/wed-pa index 1508b9b..f723a7c 100644 --- a/autoinstall/wed-pa +++ b/autoinstall/wed-pa @@ -27,11 +27,13 @@ if try_download "https://ftp.ctm.ru/PAYMENT/SFX/setup_pa.exe" "${AUTOINSTALL_EXE WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/PAYMENT/PAYMENTS.EXE" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi diff --git a/autoinstall/wed-sts b/autoinstall/wed-sts index 6972119..79fa64f 100644 --- a/autoinstall/wed-sts +++ b/autoinstall/wed-sts @@ -30,11 +30,13 @@ if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_EXE}" ; WIN_FILE_EXEC2="$DRIVE_C/Program Files/CTM/STS/stshost.exe" create_desktop "ВЭД-Склад (хост-Д)" "$WIN_FILE_EXEC2" "wedstshost" - if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" - elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] - then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" - else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + if [[ "$USE_CTMBAR" == "1" ]] ; then + if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" + elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]] + then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" + else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe" + fi + create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi - create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar" fi