softcenter:optimization

Author: paldier

release/src/router/rc/merlinr.c

@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  *
- * Copyright 2019, paldier <paldier@hotmail.com>.
+ * Copyright 2019-2020, paldier <paldier@hotmail.com>.
  * All Rights Reserved.
  * 
  *
@@ -84,8 +84,8 @@ void merlinr_init_done()
 		_dprintf("....softcenter ok....\n");
 	} else if (f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","0"))
 		nvram_set("sc_installed","1");
-	else if (!f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","1"))
-		nvram_set("sc_installed","0");
+	//else if (!f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","1"))
+		//nvram_set("sc_installed","0");
 	if(f_exists("/jffs/.asusrouter")){
 		unlink("/jffs/.asusrouter");
 		doSystem("sed -i '/softcenter-wan.sh/d' /jffs/scripts/wan-start");
@@ -154,8 +154,8 @@ void merlinr_init_done()
 #endif
 #if defined(R8000P) || defined(R7900P)
 	nvram_set("ping_target","www.taobao.com");
-	nvram_commit();
 #endif
+	nvram_commit();
 }
 
 #define FWUPDATE_DBG(fmt,args...) \

release/src/router/rc/merlinr.h

@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  *
- * Copyright 2019, paldier <paldier@hotmail.com>.
+ * Copyright 2019-2020, paldier <paldier@hotmail.com>.
  * All Rights Reserved.
  * 
  *

release/src/router/rc/watchdog.c

@@ -5467,10 +5467,9 @@ static void softcenter_sig_check()
 	//1=wan,2=nat,3=mount
 	if(nvram_match("sc_installed", "1")){
 		if(!pids("perpd")){
-			//char *perp_argv[] = { "/jffs/softcenter/perp/perp.sh", "start",NULL };
-			//pid_t pid;
-			//_eval(perp_argv, NULL, 0, &pid);
-			doSystem("sh /jffs/softcenter/perp/perp.sh start &");
+			char *perp_argv[] = { "perpboot", "-d",NULL };
+			pid_t pid;
+			_eval(perp_argv, NULL, 0, &pid);
 		}
 		if(nvram_match("sc_wan_sig", "1")) {
 			if(nvram_match("sc_mount", "1")) {
@@ -5696,7 +5695,7 @@ void modem_log_check(void) {
 			while(fgets(var, 16, fp)) {
 				line = safe_atoi(var);
 			}
-			fclose(fp);
+			pclose(fp);
 
 			if (line > MAX_MODEMLOG_LINE) {
 				snprintf(cmd, 64, "cat %s |tail -n %d > %s-1", MODEMLOG_FILE, MAX_MODEMLOG_LINE, MODEMLOG_FILE);
@@ -7542,8 +7541,10 @@ void watchdog(int sig)
 	amas_ctl_check();
 #endif
 #ifdef RTCONFIG_CFGSYNC
+#if !defined(MERLINR_VER_MAJOR_B)
 	cfgsync_check();
 #endif
+#endif
 #ifdef RTCONFIG_TUNNEL
 	mastiff_check();
 #endif

release/src/router/softcenter/jffsinit.sh

@@ -23,12 +23,12 @@ if [ "$(nvram get sc_mount)" == 1 ];then
 	mdisk=`nvram get sc_disk`
 	usb_disk="/tmp/mnt/$mdisk"
 	if [ "$(nvram get productid)" == "BLUECAVE" ];then
-		[ -n "$(mount |grep sda1 |grep tfat)" ] && logger "Unsupport TFAT!" && exit 1
+		[ -n "$(mount |grep $usb_disk |grep tfat)" ] && logger "Unsupport TFAT!" && exit 1
 	fi
 	if [ ! -e "$usb_disk" ]; then
 		nvram set sc_mount="0"
 		nvram commit
-		logger "没有找到可用的USB磁盘！" 
+		logger "USB flash drive not detected!/没有找到可用的USB磁盘!" 
 		exit 1
 	else
 		if [ ! -f "/jffs/softcenter/webs/Main_Soft_center.asp" ] ;then
@@ -50,8 +50,8 @@ if [ "$(nvram get sc_mount)" == 1 ];then
 		fi
 	fi
 else
-	logger "当前jffs分区剩余空间不足！"
-	logger "退出安装！"
+	logger "Not enough free space for JFFS!/当前jffs分区剩余空间不足!"
+	logger "Exit!/退出安装!"
 	exit 1
 fi
 fi
@@ -79,8 +79,6 @@ KVER=`uname -r`
 if [ "$ARCH" == "armv7l" ]; then
 	if [ "$KVER" == "4.1.52" -o "$KVER" == "4.1.49" ];then
 		dbus set softcenter_arch="armng"
-	elif [ "$KVER" == "3.14.77" ];then
-		dbus set softcenter_arch="armqca"
 	else
 		dbus set softcenter_arch="$ARCH"
 	fi
@@ -94,6 +92,7 @@ if [ "`nvram get model`" == "GT-AC5300" ] || [ "`nvram get model`" == "GT-AC2900
 	cp -rf /rom/etc/softcenter/ROG/res/* /jffs/softcenter/res/
 fi
 nvram set sc_installed=1
+nvram commit
 # creat wan-start file
 mkdir -p /jffs/scripts