From f8b04deb0355b08b21556a2bee97c506301ce503 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 11 Aug 2022 19:38:43 +0800 Subject: [PATCH] =?UTF-8?q?expect=20=E5=8A=A0=E5=85=A5=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- route/static/app/files.js | 23 ++++++++++++----------- scripts/install/alma.sh | 1 + scripts/install/arch.sh | 1 + scripts/install/centos.sh | 1 + scripts/install/debian.sh | 1 + scripts/install/fedora.sh | 1 + scripts/install/freebsd.sh | 1 + scripts/install/opensuse.sh | 1 + scripts/install/rocky.sh | 1 + scripts/install/ubuntu.sh | 2 +- 10 files changed, 21 insertions(+), 12 deletions(-) diff --git a/route/static/app/files.js b/route/static/app/files.js index e6e06fdb6..dafd78f1e 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -305,7 +305,7 @@ function getFiles(Path) { if(!showRow) { showRow = '100'; } - var Body = ''; + var body = ''; var data = 'path=' + Path; var loadT = layer.load(); var totalSize = 0; @@ -340,7 +340,7 @@ function getFiles(Path) { if(getCookie('rank') == 'a'){ $("#set_list").addClass("active"); $("#set_icon").removeClass("active"); - Body += "\ + body += "\ \ " + cnametext + "\ "+toSize(fmp[1])+"\ @@ -358,7 +358,7 @@ function getFiles(Path) { } else { $("#set_icon").addClass("active"); $("#set_list").removeClass("active"); - Body += "
\ + body += "
\ \
\
" + fmp[0] + "
\ @@ -397,7 +397,7 @@ function getFiles(Path) { totalSize += parseInt(fmp[1]); if(getCookie("rank")=="a"){ - Body += "\ + body += "\ " + cnametext + "\ " + (toSize(fmp[1])) + "\ " + ((fmp[2].length > 11)?fmp[2]:getLocalTime(fmp[2])) + "\ @@ -414,7 +414,7 @@ function getFiles(Path) { "; } else{ - Body += "
\ + body += "
\ \
\
" + fmp[0] + "
\ @@ -436,13 +436,13 @@ function getFiles(Path) { 操作\ \ \ - '+Body+'\ + '+body+'\ '; $("#fileCon").removeClass("fileList").html(tablehtml); $("#tipTools").width($("#fileCon").width()); } else{ - $("#fileCon").addClass("fileList").html(Body); + $("#fileCon").addClass("fileList").html(body); $("#tipTools").width($("#fileCon").width()); } $("#DirPathPlace input").val(rdata.PATH); @@ -464,19 +464,20 @@ function getFiles(Path) { var copyName = getCookie('copyFileName'); var cutName = getCookie('cutFileName'); var isPaste = (copyName == 'null') ? cutName : copyName; - console.log('isPaste:',isPaste); + // console.log('isPaste:',isPaste); //--- if (isPaste != 'null' && isPaste != undefined) { BarTools += ' '; } $("#Batch").html(''); - var BatchTools = ''; + var batchTools = ''; var isBatch = getCookie('BatchSelected'); if (isBatch == 1 || isBatch == '1') { - BatchTools += ' '; + batchTools += ' '; } - $("#Batch").html(BatchTools); + $("#Batch").html(batchTools); + $("#setBox").prop("checked", false); $("#BarTools").html(BarTools); diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index 8088c0e93..9ce000d79 100755 --- a/scripts/install/alma.sh +++ b/scripts/install/alma.sh @@ -92,6 +92,7 @@ yum install -y openldap openldap-devel yum install -y bison re2c cmake yum install -y cmake3 yum install -y autoconf +yum install -y expect yum install -y curl curl-devel yum install -y zlib zlib-devel diff --git a/scripts/install/arch.sh b/scripts/install/arch.sh index c701b3b63..69a31f2e9 100644 --- a/scripts/install/arch.sh +++ b/scripts/install/arch.sh @@ -37,6 +37,7 @@ echo y | pacman -Sy mariadb-clients echo y | pacman -Sy rpcsvc-proto echo y | pacman -Sy lemon echo y | pacman -Sy which +echo y | pacman -Sy expect ## gd start echo y | pacman -Sy gd diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index fec285bdd..306360b23 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -20,6 +20,7 @@ yum install -y python-devel yum install -y vixie-cron yum install -y curl-devel libmcrypt libmcrypt-devel yum install -y mysql-devel +yum install -y expect diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index 541cd04ee..85a391bd1 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -24,6 +24,7 @@ apt install -y python3-pip apt install -y python3-dev apt install -y python3-venv apt install -y cron +apt install -y expect apt install -y locate locale-gen en_US.UTF-8 diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 77875e794..969fe49fa 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -14,6 +14,7 @@ setenforce 0 sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config yum install -y wget curl lsof unzip +yum install -y expect dnf install crontabs -y #https need diff --git a/scripts/install/freebsd.sh b/scripts/install/freebsd.sh index 5a6f9fed3..64659dcd4 100644 --- a/scripts/install/freebsd.sh +++ b/scripts/install/freebsd.sh @@ -26,6 +26,7 @@ pkg install -y cmake pkg install -y libxslt pkg install -y libunwind pkg install -y influxpkg-config +pkg install -y expect pkg install -y pcre pkg install -y webp diff --git a/scripts/install/opensuse.sh b/scripts/install/opensuse.sh index c4d4a2bf2..4f971fcb4 100644 --- a/scripts/install/opensuse.sh +++ b/scripts/install/opensuse.sh @@ -27,6 +27,7 @@ zypper install -y libjpeg-devel libpng-devel zypper install -y libevent-devel zypper install -y libtirpc-devel zypper install -y rpcgen +zypper install -y expect zypper install -y libzip libzip-devel zypper install -y libmemcached libmemcached-devel diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index f2db307d0..59e5de5b2 100644 --- a/scripts/install/rocky.sh +++ b/scripts/install/rocky.sh @@ -17,6 +17,7 @@ yum install -y wget lsof yum install -y python3-devel yum install -y python-devel yum install -y crontabs +yum install -y expect yum install -y curl curl-devel libcurl libcurl-devel #https need diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh index ff360fc06..b36f0a98b 100644 --- a/scripts/install/ubuntu.sh +++ b/scripts/install/ubuntu.sh @@ -15,7 +15,7 @@ apt install -y wget curl lsof unzip apt install -y python3-pip apt install -y python3-venv apt install -y python3-dev - +apt install -y expect apt install -y cron