commit ffa7cb5084292a5352ca7887752738a5016255c0
author Xin Li <delphij@google.com> Wed Mar 22 21:29:59 2017 +0000
committer Xin Li <delphij@google.com> Wed Mar 22 21:29:59 2017 +0000
tree c1b6bbbb6dc3e439ea812eb05bf88775c894f67d
parent 98a61f0647f828052d3af735180c11b26c746bdc

Revert "Allow injecting a script to do additional pre-package processing."

This reverts commit 98a61f0647f828052d3af735180c11b26c746bdc.

Change-Id: Ieec5e0c02208118ab06932872cb5e74a49691fcb

generate-packages.sh

diff --git a/generate-packages.sh b/generate-packages.sh
index 473cef1..d24f75e 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if [ $# -lt 6 -o $# -gt 7 ]
+if [ $# != 6 ]
 then
-  echo Usage: $0 BUILD_ID BUILD ROOTDEVICE DEVICE MANUFACTURER PRODUCT [PATCHSCRIPT]
+  echo Usage: $0 BUILD_ID BUILD ROOTDEVICE DEVICE MANUFACTURER PRODUCT
   echo Example: $0 1075408 KOT49Y mako mako lge occam
 fi
 
@@ -28,7 +28,6 @@
 ROOTDEVICE=$3
 DEVICE=$4
 MANUFACTURER=$5
-PATCHSCRIPT=$7
 
 cd ../$MANUFACTURER/$ROOTDEVICE/self-extractors || echo Error change dir
 
@@ -145,10 +144,6 @@
     mv ${FILEDIR_ROOT}/device-vendor-sailfish.mk ${FILEDIR_ROOT_SHARE}
   fi
 
-  if [ -n ${PATCHSCRIPT} ]; then
-    ${PATCHSCRIPT}
-  fi
-
   echo \ \ Generating self-extracting script
   SCRIPT=extract-$COMPANY-$DEVICE.sh
   cat PROLOGUE > tmp/$SCRIPT || echo \ \ \ \ Error generating script