diff --git a/modulecheck/app.json b/modulecheck/app.json index cefa8ec50641525c37e947ff1b83c6cff86faacf..5dcd461f4b49b27fae4cf7e8348f28e54e9b4a2a 100644 --- a/modulecheck/app.json +++ b/modulecheck/app.json @@ -43,7 +43,6 @@ "singleton", "userDataClearable", "accessible", - "targetBundleList", "default", "tablet", "tv", @@ -170,14 +169,6 @@ "type": "boolean", "default": false }, - "targetBundleList": { - "description": "This tag specifies the list of services that can be installed without the application. The list contains the bundle name of each service. A maximum of five bundle names can be configured. This label is a string array type and can be defaulted.", - "type": "array", - "maxItems": 5, - "items": { - "type": "string" - } - }, "default": { "description": "The configuration in the default tag is applicable to all devices. If the configuration is different for other device types, you need to configure the configuration under the configuration tag of the device type.", "type": "object", diff --git a/packingTool.sh b/packingTool.sh index 48127eaf72199985f335929cfca74465a3be08bb..05acee27bd860fb2f6717407afd77b9417735824 100755 --- a/packingTool.sh +++ b/packingTool.sh @@ -113,6 +113,12 @@ eval ${product_pack_jar_command} # merge app_packing_tool.jar and fastjson temp_dir="$root_path/jar/temp" +if [ -d "$temp_dir" ] + then + rm -rf $temp_dir + else + echo "$temp_dir not exit" +fi mkdir $temp_dir cp $pack_jar_path "$temp_dir/$pack_jar_file" cp $fastjson_jar_path "$temp_dir/$fastjson_jar_file" @@ -129,7 +135,7 @@ merge_pack_fast_jar_command="jar -cvfm $pack_jar_file $manifest_path -C $temp_di eval $merge_pack_fast_jar_command if [ -d "$temp_dir" ] then - rm -r $temp_dir + rm -rf $temp_dir else echo "$temp_dir not exit" fi