diff --git a/CLIENT_DATA/AdobeAIR_7zip_config.txt b/CLIENT_DATA/AdobeAIR_7zip_config.txt index a95e682..2463645 100644 --- a/CLIENT_DATA/AdobeAIR_7zip_config.txt +++ b/CLIENT_DATA/AdobeAIR_7zip_config.txt @@ -1,6 +1,6 @@ ;!@Install@!UTF-8! -RunProgram="air16-0_win.exe -silent -eulaAccepted" +RunProgram="air17-0_win.exe -silent -eulaAccepted" ExtractTitle="Geos One Adobe Air 16.x Installer" -ExtractDialogText="Extracting Adobe AIR 16.x" +ExtractDialogText="Extracting Adobe AIR 17.x" GUIMode="1" ;!@InstallEnd@! diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index ca19e1d..cd4d709 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -145,7 +145,7 @@ function create() { # integrate Adobe AIR # ========================================================================================================== - mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe + mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt sed -e 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml @@ -155,9 +155,9 @@ function create() { # Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally - 7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe + 7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe - rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air16-0_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z + rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z # ========================================================================================================== # Update Java