From 3c08ebba28cbd35b526959a16743cb111e6add4f Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 22 Feb 2014 09:02:22 +0100 Subject: [PATCH] add iconv to convert utf16 to utf8 --- CLIENT_DATA/MSVC05_x64_Install.cmd | 2 +- CLIENT_DATA/MSVC05_x86_Install.cmd | 2 +- CLIENT_DATA/MSVC08_x64_Install.cmd | 2 +- CLIENT_DATA/MSVC08_x86_Install.cmd | 2 +- builder-product.cfg | 8 ++++---- builder-targets-cb.sh | 2 +- gawk-4.1.0-bin.zip.sha1sum | 1 - libiconv-1.14-bin.zip.sha1sum | 1 + 8 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 gawk-4.1.0-bin.zip.sha1sum create mode 100644 libiconv-1.14-bin.zip.sha1sum diff --git a/CLIENT_DATA/MSVC05_x64_Install.cmd b/CLIENT_DATA/MSVC05_x64_Install.cmd index d0e1ab8..d4321f3 100644 --- a/CLIENT_DATA/MSVC05_x64_Install.cmd +++ b/CLIENT_DATA/MSVC05_x64_Install.cmd @@ -36,7 +36,7 @@ echo (please wait as this process may take a few moments) wmic product where "name like 'Microsoft Visual C++ 2005 Redistributable%%'" get name >>"%temp%\list.txt" -%SEDPARENTDIR%\sed\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" +%SEDPARENTDIR%\gnu\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" for /f "usebackq skip=1 delims=" %%a in ('type "%temp%\list.txt"') do (wmic product where name='%%a' call uninstall /nointeractive) diff --git a/CLIENT_DATA/MSVC05_x86_Install.cmd b/CLIENT_DATA/MSVC05_x86_Install.cmd index e032126..68391f1 100644 --- a/CLIENT_DATA/MSVC05_x86_Install.cmd +++ b/CLIENT_DATA/MSVC05_x86_Install.cmd @@ -36,7 +36,7 @@ echo (please wait as this process may take a few moments) wmic product where "name like 'Microsoft Visual C++ 2005 Redistributable - x86%%'" get name >>"%temp%\list.txt" -%SEDPARENTDIR%\sed\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" +%SEDPARENTDIR%\gnu\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" for /f "skip=1 delims=" %%a in ('type "%temp%\list.txt"') do (wmic product where "name like '%%a%'" call uninstall /nointeractive) diff --git a/CLIENT_DATA/MSVC08_x64_Install.cmd b/CLIENT_DATA/MSVC08_x64_Install.cmd index 0eafb56..a03b5da 100644 --- a/CLIENT_DATA/MSVC08_x64_Install.cmd +++ b/CLIENT_DATA/MSVC08_x64_Install.cmd @@ -36,7 +36,7 @@ echo (please wait as this process may take a few moments) wmic product where "name like 'Microsoft Visual C++ 2008 Redistributable - x64%%'" get name >>"%temp%\list.txt" -%SEDPARENTDIR%\sed\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" +%SEDPARENTDIR%\gnu\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" for /f "usebackq skip=1 delims=" %%a in ('type "%temp%\list.txt"') do (wmic product where name='%%a' call uninstall /nointeractive) diff --git a/CLIENT_DATA/MSVC08_x86_Install.cmd b/CLIENT_DATA/MSVC08_x86_Install.cmd index 2f470fe..4bfb4fb 100644 --- a/CLIENT_DATA/MSVC08_x86_Install.cmd +++ b/CLIENT_DATA/MSVC08_x86_Install.cmd @@ -36,7 +36,7 @@ echo (please wait as this process may take a few moments) wmic product where "name like 'Microsoft Visual C++ 2008 Redistributable - x86%%'" get name >>"%temp%\list.txt" -%SEDPARENTDIR%\sed\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" +%SEDPARENTDIR%\gnu\sed.exe -e 's/[ \t]*$//' -i "%temp%\list.txt" for /f "skip=1 delims=" %%a in ('type "%temp%\list.txt"') do (wmic product where "name like '%%a%'" call uninstall /nointeractive) diff --git a/builder-product.cfg b/builder-product.cfg index 8cc8cb3..990c34e 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -267,13 +267,13 @@ DL_FILE[5]="sed-4.2.2-bin.zip" DL_SOURCE[5]="https://gnu-on-windows.googlecode.com/files/sed-4.2.2-bin.zip" DL_ARCH[5]="X86" DL_EXTRACT_FORMAT[5]="unzip" -DL_EXTRACT_TO[5]="sed" +DL_EXTRACT_TO[5]="gnu" -DL_FILE[6]="gawk-4.1.0-bin.zip" -DL_SOURCE[6]="https://gnu-on-windows.googlecode.com/files/gawk-4.1.0-bin.zip" +DL_FILE[6]="libiconv-1.14-bin.zip" +DL_SOURCE[6]="https://gnu-on-windows.googlecode.com/files/libiconv-1.14-bin.zip" DL_ARCH[6]="X86" DL_EXTRACT_FORMAT[6]="unzip" -DL_EXTRACT_TO[6]="gawk" +DL_EXTRACT_TO[6]="gnu" ################## diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 6b47d1f..0abfb55 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -239,7 +239,7 @@ function create() { rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC else - mv -v $INST_DIR/CLIENT_DATA/X86/sed $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/sed + mv -v $INST_DIR/CLIENT_DATA/X86/gnu $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/gnu # sed -e "s!vcredist.msi!Install.cmd!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml # mv -v $INST_DIR/CLIENT_DATA/MSVC05_x64_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x64/msvc_05/Install.cmd # mv -v $INST_DIR/CLIENT_DATA/MSVC05_x86_Install.cmd $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/x86/msvc_05/Install.cmd diff --git a/gawk-4.1.0-bin.zip.sha1sum b/gawk-4.1.0-bin.zip.sha1sum deleted file mode 100644 index 3906970..0000000 --- a/gawk-4.1.0-bin.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -75e038003b5ebfdb73228d6f72891ccd3617b383 /home/mario/.opsi-dist-cache/sereby.aio-2.1.0.1/X86/gawk-4.1.0-bin.zip diff --git a/libiconv-1.14-bin.zip.sha1sum b/libiconv-1.14-bin.zip.sha1sum new file mode 100644 index 0000000..90fad68 --- /dev/null +++ b/libiconv-1.14-bin.zip.sha1sum @@ -0,0 +1 @@ +e6776816ac66f4e7a8513ed4a308cf9f1259ef7a /home/mario/.opsi-dist-cache/sereby.aio-2.1.0.1/X86/libiconv-1.14-bin.zip