Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

## 使用方法
```
source <(wget -qO- http://fishros.com/install)
source <(wget -qO- https://fishros.com/install)
```

## 如何自动选择(Dockerfile中使用)
Expand All @@ -48,7 +48,7 @@ RUN apt update \
&& echo "- {choose: 2, desc: 清理三方源}\n" >> fish_install.yaml \
&& echo "- {choose: 1, desc: melodic(ROS1)}\n" >> fish_install.yaml \
&& echo "- {choose: 1, desc: melodic(ROS1)桌面版}\n" >> fish_install.yaml \
&& wget http://fishros.com/install -O fishros && /bin/bash fishros \
&& wget https://fishros.com/install -O fishros && /bin/bash fishros \
# 进行最后的清理
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& apt-get clean && apt autoclean
Expand All @@ -65,7 +65,7 @@ RUN apt update \
&& echo "- {choose: 5, desc: '一键安装:ROS(支持ROS和ROS2,树莓派Jetson)'}\n" >> fish_install.yaml \
&& echo "- {choose: 2, desc: 更换源继续安装}\n" >> fish_install.yaml \
&& echo "- {choose: 1, desc: 清理三方源}\n" >> fish_install.yaml \
&& wget http://fishros.com/install -O fishros && /bin/bash fishros \
&& wget https://fishros.com/install -O fishros && /bin/bash fishros \
# 进行最后的清理
&& rm -rf fish_install.yaml \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
Expand Down
2 changes: 1 addition & 1 deletion install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export FISHROS_URL=http://mirror.fishros.com/install/
export FISHROS_URL=https://mirror.fishros.com/install/

mkdir -p /tmp/fishinstall/tools/translation/assets
wget $FISHROS_URL/install.py -O /tmp/fishinstall/install.py 2>>/dev/null
Expand Down
10 changes: 5 additions & 5 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
import importlib

url_prefix = os.environ.get("FISHROS_URL", "http://mirror.fishros.com/install/")
url_prefix = os.environ.get("FISHROS_URL", "https://mirror.fishros.com/install/")
base_url = os.path.join(url_prefix, "tools/base.py")
translator_url = os.path.join(url_prefix, "tools/translation/translator.py")

Expand Down Expand Up @@ -160,15 +160,15 @@

def main():
os.system("mkdir -p /tmp/fishinstall/tools/translation/assets")
url_prefix = os.environ.get("FISHROS_URL", "http://mirror.fishros.com/install/")
url_prefix = os.environ.get("FISHROS_URL", "https://mirror.fishros.com/install/")
if url_prefix:
os.system(
Comment on lines 161 to 165
"wget {} -O /tmp/fishinstall/{} --no-check-certificate".format(
"wget {} -O /tmp/fishinstall/{}".format(
base_url, base_url.replace(url_prefix, "")
)
)
os.system(
"wget {} -O /tmp/fishinstall/{} --no-check-certificate".format(
"wget {} -O /tmp/fishinstall/{}".format(
translator_url, translator_url.replace(url_prefix, "")
)
)
Expand All @@ -194,7 +194,7 @@ def main():

# 使用量统计
CmdTask(
"wget https://fishros.org.cn/forum/topic/1733 -O /tmp/t1733 -q --no-check-certificate --timeout 10 && rm -rf /tmp/t1733"
"wget https://fishros.org.cn/forum/topic/1733 -O /tmp/t1733 -q --timeout 10 && rm -rf /tmp/t1733"
).run()

PrintUtils.print_success(tr.tr("已为您切换语言至当前所在国家语言:") + tr.lang)
Expand Down
6 changes: 3 additions & 3 deletions tools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@ def run_tool_file(file, authorun=True):

def run_tool_url(url, url_prefix):
CmdTask(
"wget {} -O /tmp/fishinstall/tools/{} --no-check-certificate".format(
"wget {} -O /tmp/fishinstall/tools/{}".format(
url, url[url.rfind("/") + 1 :]
)
Comment on lines 1643 to 1647
).run()
Expand All @@ -1654,7 +1654,7 @@ def download_tools(id, tools, url_prefix):
url = tools[id]["tool"]
url = os.path.join(url_prefix, url)
CmdTask(
"wget {} -O /tmp/fishinstall/tools/{} --no-check-certificate".format(
"wget {} -O /tmp/fishinstall/tools/{}".format(
url, url[url.rfind("/") + 1 :]
)
).run()
Expand All @@ -1663,7 +1663,7 @@ def download_tools(id, tools, url_prefix):
url = tools[dep]["tool"]
url = os.path.join(url_prefix, url)
CmdTask(
"wget {} -O /tmp/fishinstall/tools/{} --no-check-certificate".format(
"wget {} -O /tmp/fishinstall/tools/{}".format(
url, url[url.rfind("/") + 1 :]
)
).run()
Expand Down
2 changes: 1 addition & 1 deletion tools/translation/translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def __init__(self):
# Use /tmp/ directory directly to avoid permission issues
temp_file = "/tmp/fishros_lang_{}.py".format(lang)
final_path = "/tmp/fishinstall/{}".format(lang_url.format(lang).replace(url_prefix, ''))
download_cmd = "wget {} -O {} --no-check-certificate".format(lang_url.format(lang), temp_file)
download_cmd = "wget {} -O {}".format(lang_url.format(lang), temp_file)
result = CmdTask(download_cmd).run()
# Move file to final destination if download was successful
if result[0] == 0:
Expand Down