From f187948ee676559872c7f999394546d9cd30feb0 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 9 Apr 2013 22:45:46 +0200 Subject: [PATCH] Correct surrounding scripts to reflect the change --- CLIENT_DATA/setup32.ins | 2 +- builder-targets-cb.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 7c82cdb..b0a65b9 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -86,7 +86,7 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" -copy -s "%ScriptPath%\X86\*.xpi" "$InstallDir$\distribution\extensions" +copy -s "%ScriptPath%\X86\Plugins\*.*" "$InstallDir$\distribution\extensions" del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi" [Registry_install] diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 5bd9f81..7d14ec0 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -28,7 +28,7 @@ function create() { echo "Create" builder_create mkdir -p $INST_DIR/CLIENT_DATA/X86/Plugins/{{e2fda1a4-762b-4020-b5ad-a41df1933103},exquilla@mesquilla.com} - 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103} $INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi - 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/exquilla@mesquilla.com $INST_DIR/CLIENT_DATA/X86/Plugins/exquilla-currentrelease-tb-windows.xpi - + 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103} $INST_DIR/CLIENT_DATA/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi + 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/exquilla@mesquilla.com $INST_DIR/CLIENT_DATA/X86/exquilla-currentrelease-tb-windows.xpi + mv $INST_DIR/CLIENT_DATA/X86/*.xpi $INST_DIR/CLIENT_DATA/X86/Plugins }