#0000203: Support tar.gz file of luci in the apply download of config

pivasoftware · Feb 16, 2017 · 4915cb1 · 4915cb1
1 parent 8f85cdf
commit 4915cb1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/ext/openwrt/scripts/easycwmp.sh b/ext/openwrt/scripts/easycwmp.sh
@@ -296,13 +296,21 @@ handle_action() {
 					tar -zxf $dwfile -C $DOWNLOAD_DIR >/dev/null 2>&1
 					fault_code="$?"
 					if [ "$fault_code" = "0" ]; then
-						cp $DOWNLOAD_DIR/config/* /etc/config/
+						if [ -d $ $DOWNLOAD_DIR/config/ ]
+							cp -R $DOWNLOAD_DIR/config/* /etc/config/
+						else
+							cp -R $DOWNLOAD_DIR/* /
+						fi
 					fi
 				elif [ ${dwfile%.bz2} != $dwfile ]; then
 					tar -jxf $dwfile -C $DOWNLOAD_DIR >/dev/null 2>&1
 					fault_code="$?"
 					if [ "$fault_code" = "0" ]; then
-						cp $DOWNLOAD_DIR/config/* /etc/config/
+						if [ -d $ $DOWNLOAD_DIR/config/ ]
+							cp -R $DOWNLOAD_DIR/config/* /etc/config/
+						else
+							cp -R $DOWNLOAD_DIR/* /
+						fi
 					fi
 				else
 					/sbin/uci import < $dwfile