beenull/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix

Browse source
This commit is contained in:
Darren 2023-10-06 18:59:47 +08:00 committed by GitHub
parent 85f9be3c04
commit 61a3de3856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog_latest.md
View file

@ -1,2 +1,2 @@
1. Fix install error: apt locked
2. Install: add Docker daemon.json
1. Fix install error: print version at Ubuntu
2. Fix install error: cockpit can not start at Ubuntu

4
install/install.sh
View file

@ -120,7 +120,7 @@ install_tools(){
download_source() {
echo_prefix_source=$'\n[Dowload Source] - '
echo_prefix_source=$'\n[Download Source] - '
echo "$echo_prefix_source Download Websoft9 source code from $artifact_url/$source_zip"
find . -type f -name "websoft9*.zip*" -exec rm -f {} \;
@ -290,7 +290,7 @@ install_systemd() {
sudo mkdir -p "$systemd_path"
fi
sudo cp -r $install_path/systemd/* "$systemd_path"
sudo cp -r $install_path/systemd/script/* "$systemd_path"
sudo cp -f "$systemd_path/websoft9.service" /lib/systemd/system/
if [ $? -ne 0 ]; then
echo "Failed to copy Systemd service file."

6
install/install_cockpit.sh
View file

@ -102,7 +102,7 @@ check_ports() {
}
Print_Version(){
sudo /usr/libexec/cockpit-ws --version 2>/dev/null || sudo /usr/lib/cockpit-ws --version 2>/dev/null
sudo /usr/libexec/cockpit-ws --version 2>/dev/null || sudo /usr/lib/cockpit-ws --version 2>/dev/null || /usr/lib/cockpit/cockpit-ws --version 2>/dev/null
}
Install_PackageKit(){
@ -132,7 +132,7 @@ Install_PackageKit(){
Set_Repository() {
echo "$echo_prefix_cockpit Set Cockpit repository"
echo "$echo_prefix_cockpit Set Cockpit deb repository"
if command -v apt &> /dev/null; then
if [ "$NAME" = "Debian" ]; then
echo "deb http://deb.debian.org/debian $VERSION_CODENAME-backports main" > /etc/apt/sources.list.d/backports.list
@ -147,8 +147,8 @@ Set_Repository() {
Restart_Cockpit(){
echo "$echo_prefix_cockpit Restart Cockpit"
sudo systemctl daemon-reload
sudo systemctl restart cockpit
sudo systemctl restart cockpit.socket 2> /dev/null
sudo systemctl restart cockpit
}
Set_Firewall(){

2
version.json
View file

@ -1,5 +1,5 @@
{
"version": "0.8.26-rc4",
"version": "0.8.26-rc5",
"plugins": {
"portainer": "0.0.6",
"nginx": "0.0.5",