Austin/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2024-11-16 03:32:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

v1.4.0

Browse Source 
~修复下载更新失败时不会正常报错的bug
This commit is contained in:
juewuy 2021-06-18 13:18:19 +08:00
parent c0ee6d273f
commit c61d54a5a7
2 changed files with 4 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
bin/hfs/hfs.ini
View File

@ -1,161 +0,0 @@
HFS 2.3 beta - Build #271
active=yes
only-1-instance=yes
window=274,196,993,672
window-max=no
easy=yes
port=8080
files-box-ratio=0
log-max-lines=2000
log-read-only=yes
log-file-name=
log-font-name=
log-font-size=0
log-date=no
log-time=yes
log-only-served=yes
log-server-start=no
log-server-stop=no
log-connections=no
log-disconnections=no
log-bytes-sent=no
log-bytes-received=no
log-replies=no
log-requests=yes
log-uploads=yes
log-deletions=yes
log-full-downloads=yes
log-dump-request=no
log-browsing=yes
log-icons=no
log-progress=no
log-banned=no
log-others=yes
log-file-tabbed=no
log-apache-format=
tpl-file=
tpl-editor=C:\WINDOWS\NOTEPAD.EXE
delete-dont-ask=no
free-login=no
confirm-exit=yes
keep-bak-updating=yes
include-pwd-in-pages=no
ip=192.168.123.90
custom-ip=
listen-on=
external-ip-server=
dynamic-dns-updater=
dynamic-dns-user=
dynamic-dns-host=
search-better-ip=no
start-minimized=no
connections-height=102
files-stay-flagged-for-minutes=6000
auto-save-vfs=no
folders-before=yes
links-before=yes
use-comment-as-realm=yes
getright-template=yes
auto-save-options=yes
dont-include-port-in-url=no
persistent-connections=yes
modal-options=yes
beep-on-flash=no
prevent-leeching=yes
delete-partial-uploads=no
rename-partial-uploads=
enable-macros=yes
use-system-icons=yes
minimize-to-tray=yes
tray-icon-for-each-download=yes
show-main-tray-icon=yes
always-on-top=no
quit-dont-ask=no
support-descript.ion=yes
oem-descript.ion=no
enable-fingerprints=yes
save-fingerprints=no
auto-fingerprint=0
encode-pwd-url=yes
stop-spiders=yes
backup-saving=no
recursive-listing=yes
send-hfs-identifier=yes
list-hidden-files=no
list-system-files=no
list-protected-items=no
enable-no-default=yes
browse-localhost=yes
add-folder-default=
default-sorting=
last-dialog-folder=F:\Github\ShellClash
auto-save-vfs-every=0
last-update-check=44354.7419466551
allowed-referer=
forwarded-mask=127.0.0.1
tray-shows=connections
tray-message=本机IP:%ip%\n在线时长:%uptime%\n下载数量:%downloads%
speed-limit=-1
speed-limit-ip=-1
max-ips=0
max-ips-downloading=0
max-connections=0
max-connections-by-ip=0
max-contemporary-dls=0
max-contemporary-dls-ip=0
login-realm=请输入用户名及密码：
open-in-browser=*.htm;*.html;*.jpg;*.jpeg;*.gif;*.png;*.txt;*.swf;*.svg
flash-on=download
graph-rate=10
graph-size=30
graph-visible=no
no-download-timeout=0
connections-timeout=60
no-reply-ban=yes
ban-list=
add-to-folder=
last-file-open=~temp.vfs
reload-on-startup=yes
https-url=no
find-external-on-startup=yes
encode-non-ascii=yes
encode-spaces=yes
mime-types=*.js|text/javascript|*.htm;*.html|text/html|*.jpg;*.jpeg;*.jpe|image/jpeg|*.gif|image/gif|*.png|image/png|*.bmp|image/bmp|*.ico|image/x-icon|*.mpeg;*.mpg;*.mpe|video/mpeg|*.avi|video/x-msvideo|*.txt|text/plain|*.css|text/css
in-browser-if-mime=yes
icon-masks=
icon-masks-user-images=
address2name=
recent-files=~temp.vfs
trusted-files=~temp.vfs
leave-disconnected-connections=no
accounts=|login:Y2FuIGNoYW5nZSBwYXNzd29yZDo=|enabled:yes|group:yes|no-limits:no|notes:tMvTw7un1+m1xNPDu6e/ydTav827p7bL19TQ0NDeuMTD3MLroaPI57n7z+vUytDt08O7p7j8uMTD3MLro6zH69Ta08O7p9XLu6fRodTx08O7p9fp1tDRodTxY2FuIGNoYW5nZSBwYXNzd29yZA==;
account-notes-wrap=yes
tray-instead-of-quit=yes
compressed-browsing=yes
use-iso-date-format=no
hints4newcomers=yes
save-totals=yes
log-toolbar-expanded=yes
number-files-on-upload=yes
do-not-log-address=
last-external-address=
min-disk-space=0
out-total=5283738
in-total=22201
hits-total=59
downloads-total=16
upload-total=0
many-items-warning=no
load-single-comment-files=yes
copy-url-on-start=yes
connections-columns=IP地址;120|文件;180|状态;180|速度;60|剩余时间;55|进度;117|
auto-comment=no
update-daily=no
delayed-update=no
tester-updates=yes
copy-url-on-addition=yes
ip-services=http://www.rejetto.com/ip/|;http://checkip.dyndns.org|:;http://www.canyouseeme.org|value=";http://www.whatsmyrealip.com/|IP is<br>
ip-services-time=44363.8012241319
update-automatically=no
prevent-standby=no
ips-ever-connected=127.0.0.1;192.168.123.90;192.168.3.7

8
scripts/start.sh
View File

@ -152,7 +152,7 @@ EOF`
yaml=$clashdir/config.yaml yaml=$clashdir/config.yaml
yamlnew=/tmp/clash_config_$USER.yaml yamlnew=/tmp/clash_config_$USER.yaml
rm -rf $yamlnew rm -rf $yamlnew
webget $yamlnew $Https 0 0 0 1 $0 webget $yamlnew $Https 0 0 0 1
if [ "$result" != "200" ];then if [ "$result" != "200" ];then
if [ -z "$markhttp" ];then if [ -z "$markhttp" ];then
echo ----------------------------------------------- echo -----------------------------------------------
@ -313,7 +313,7 @@ cn_ip_route(){
mv $clashdir/cn_ip.txt $bindir/cn_ip.txt mv $clashdir/cn_ip.txt $bindir/cn_ip.txt
else else
logger "未找到cn_ip列表，正在下载！" 33 logger "未找到cn_ip列表，正在下载！" 33
webget $bindir/cn_ip.txt "$update_url/bin/china_ip_list.txt" $0 webget $bindir/cn_ip.txt "$update_url/bin/china_ip_list.txt"
[ "$result" != 200 ] && rm -rf $bindir/cn_ip.txt && logger "列表下载失败，已退出！" 31 && exit 1 [ "$result" != 200 ] && rm -rf $bindir/cn_ip.txt && logger "列表下载失败，已退出！" 31 && exit 1
fi fi
fi fi
@ -620,7 +620,7 @@ bfstart(){
fi fi
[ -z "$cpucore" ] && source $clashdir/getdate.sh && getcpucore [ -z "$cpucore" ] && source $clashdir/getdate.sh && getcpucore
[ -z "$cpucore" ] && logger 找不到设备的CPU信息，请手动指定处理器架构类型！ 31 && setcpucore [ -z "$cpucore" ] && logger 找不到设备的CPU信息，请手动指定处理器架构类型！ 31 && setcpucore
webget $bindir/clash "$update_url/bin/$clashcore/clash-linux-$cpucore" $0 webget $bindir/clash "$update_url/bin/$clashcore/clash-linux-$cpucore"
[ "$result" != 200 ] && rm -rf $bindir/clash && logger "核心下载失败，已退出！" 31 && exit 1 [ "$result" != 200 ] && rm -rf $bindir/clash && logger "核心下载失败，已退出！" 31 && exit 1
[ ! -x $bindir/clash ] && chmod +x $bindir/clash #检测可执行权限 [ ! -x $bindir/clash ] && chmod +x $bindir/clash #检测可执行权限
clashv=$($bindir/clash -v | awk '{print $2}') clashv=$($bindir/clash -v | awk '{print $2}')
@ -634,7 +634,7 @@ bfstart(){
else else
logger "未找到GeoIP数据库，正在下载！" 33 logger "未找到GeoIP数据库，正在下载！" 33
[ -z "$geotype" ] && geotype=cn_mini.mmdb [ -z "$geotype" ] && geotype=cn_mini.mmdb
webget $bindir/Country.mmdb $update_url/bin/$geotype $0 webget $bindir/Country.mmdb $update_url/bin/$geotype
[ "$result" != 200 ] && rm -rf $bindir/Country.mmdb && logger "数据库下载失败，已退出！" 31 && exit 1 [ "$result" != 200 ] && rm -rf $bindir/Country.mmdb && logger "数据库下载失败，已退出！" 31 && exit 1
Geo_v=$(date +"%Y%m%d") Geo_v=$(date +"%Y%m%d")
setconfig Geo_v $Geo_v setconfig Geo_v $Geo_v