Fix bug while generating images
authorJeon Sang-Heon <sh95.jeon@samsung.com>
Wed, 26 Aug 2020 12:08:42 +0000 (12:08 +0000)
committerJeon Sang-Heon <sh95.jeon@samsung.com>
Wed, 26 Aug 2020 16:03:01 +0000 (16:03 +0000)
- Fix ignoring last line if there is no new lines in config file
- Fix unexpected file compression by using asterisk

Change-Id: Ic6258eede8f131793063b66e0a3b8fc752ce7532
Signed-off-by: Jeon Sang-Heon <sh95.jeon@samsung.com>
recovery/scripts/generate_package.sh

index ad1a4bb..097f61b 100755 (executable)
@@ -43,7 +43,8 @@ function __unpack__() {
 }
 
 function __pack__() {
-       while read LABEL BINARY DEV
+       BINARY_LIST="$CONFIG_NAME"
+       while read LABEL BINARY DEV || [ -n "$LABEL" ]
        do
                # Ignore empty or comment line
                if [ -z "$LABEL" ] || [[ "$LABEL" == "#"* ]]; then
@@ -54,12 +55,15 @@ function __pack__() {
                        echo "[ERROR] not found $BINARY, please check image file"
                        exit
                fi
+
+               BINARY_LIST="$BINARY_LIST $BINARY"
        done < "$CONFIG_PATH"
        echo "[INFO] Success to check all image file exists"
+       echo "[INFO] Binary list : $BINARY_LIST"
 
        cp $CONFIG_PATH $TEMP_DIR
        cd $TEMP_DIR
-       mksquashfs * $IMAGE_NAME
+       mksquashfs $BINARY_LIST $IMAGE_NAME
        chmod 777 $IMAGE_NAME
        mv $IMAGE_NAME $RESULT_DIR
 }