Skip to content

Commit 84accc9

Browse files
KangLinKangLin
committed
Script: modify script to support deepin
1 parent 0ccb71a commit 84accc9

10 files changed

Lines changed: 182 additions & 84 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ jobs:
249249
250250
echo "|Linux|[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |Unzip the zip file, then execute \`install.sh\` to install shortcuts for application, links, and directories in graphical user interfaces (GUIs), or execute \`RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_*.AppImage\` to run program in the terminal.|解压 zip 文件，然后执行 \`install.sh\`， 安装用于图形界面的目录、桌面快捷方式；或者在终端中执行 \`RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_*.AppImage\` 文件，运行程序。|" >> ${{github.workspace}}/Release.md
251251
252-
echo "|Ubuntu 24.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04-arm_arm64.deb)| |Because the system library version is too low, some features are restricted.<br> Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it.|因为系统库版本太低，所以部分功能受限。<br>运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
253-
echo "|Ubuntu 25.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_aarch64.deb)| | Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
254-
echo "|Ubuntu 26.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_aarch64.deb)| | Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
252+
echo "|Ubuntu 24.04 [noble]|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04-arm_arm64.deb)| |Because the system library version is too low, some features are restricted.<br> Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it.|因为系统库版本太低，所以部分功能受限。<br>运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
253+
echo "|Ubuntu 25.04 [questing]|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu25.04_aarch64.deb)| | Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
254+
echo "|Ubuntu 26.04 [resolute]|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu26.04_aarch64.deb)| | Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
255255
256256
echo "|Debian 12|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian12_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian12_aarch64.deb)| |Because the system library version is too low, some features are restricted.<br> Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it.|因为系统库版本太低，所以部分功能受限。<br>运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
257257
echo "|Debian 13|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_aarch64.deb)| |Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md

‎.github/workflows/docker.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ jobs:
5151
lable: "13"
5252
os: ubuntu-24.04-arm
5353

54+
- PACKAGE: deb
55+
image: linuxdeepin/beige
56+
lable: "latest"
57+
os: ubuntu-24.04
58+
# - PACKAGE: deb
59+
# image: linuxdeepin/beige
60+
# lable: "latest"
61+
# os: ubuntu-24.04-arm
62+
5463
- PACKAGE: appimage
5564
image: ubuntu
5665
lable: "25.04"

‎Package/debian/control.deepin.23‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# https://www.debian.org/doc/debian-policy/ch-controlfields.html
2+
3+
Source: rabbitremotecontrol
4+
Section: main
5+
Priority: optional
6+
Maintainer: Kang Lin <kl222@126.com>
7+
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
8+
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
9+
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
10+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
11+
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
12+
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13+
qt6-speech-dev,
14+
libssl-dev, libcrypt-dev, libcmark-dev,
15+
freerdp2-dev, libvncserver-dev, libpcap-dev,
16+
libcurl4-openssl-dev,
17+
libmariadb-dev, libmariadb-dev-compat,
18+
libxtst-dev, libxcb1-dev, libxcb-xtest0-dev, libxcb-keysyms1-dev
19+
Standards-Version: 4.6.2
20+
Homepage: https://github.com/KangLin/RabbitRemoteControl
21+
Vcs-Git: https://github.com/KangLin/RabbitRemoteControl.git
22+
Vcs-Browser: https://github.com/KangLin/RabbitRemoteControl
23+
Rules-Requires-Root: binary-targets
24+
25+
Package: rabbitremotecontrol
26+
Section: net
27+
Architecture: any
28+
#Pre-Depends: ${misc:Pre-Depends}
29+
#Suggests: libqt6svg6
30+
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libqt6sql6-psql, libmariadb3,
31+
${shlibs:Depends}, ${misc:Depends}
32+
Replaces: rabbitcommon (>=2.3.2)
33+
Description: Rabbit Remote Control
34+
Rabbit remote control is is a cross-platform,
35+
multi-protocol remote control software.
36+
.
37+
Allows you to use any device and system in anywhere and remotely manage
38+
any device and system in any way.
39+
.
40+
It's goal is to be simple, convenient, security and easy to use, improving work efficiency.
41+
.
42+
It include remote desktop, remote control, file transfer(FTP, SFTP),
43+
terminal, remote terminal(SSH, TELNET), player, network tools etc functions.
44+
.
45+
Author: Kang Lin <kl222@126.com>
46+
.
47+
Donation:
48+
.
49+
https://github.com/KangLin/RabbitCommon/raw/master/Src/Resource/image/Contribute.png
50+
.
51+
https://gitee.com/kl222/RabbitCommon/raw/master/Src/Resource/image/Contribute.png
52+
.
53+
https://gitlab.com/kl222/RabbitCommon/-/raw/master/Src/Resource/image/Contribute.png

‎Script/build_android.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if [ -z "$BUILD_VERBOSE" ]; then
1111
fi
1212

1313
source $(dirname $(readlink -f $0))/common.sh
14+
detect_os_info
1415

1516
# modify follow value
1617
Qt6_DIR=/opt/Qt/6.6.3/android_x86_64

‎Script/build_appimage.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if command -V getopt >/dev/null; then
4141
OPTS=help,verbose::,install:,source:,tools:,build:
4242
ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
4343
if [ $? != 0 ]; then
44-
echo "exec getopt fail: $?"
44+
log_fail "exec getopt fail: $?"
4545
exit 1
4646
fi
4747
#echo "ARGS=[$ARGS]"
@@ -203,7 +203,7 @@ if [ -d "${INSTALL_DIR}/share/qtermwidget6" ]; then
203203
echo "Copy qtermwidget6 resources ......."
204204
cp -r ${INSTALL_DIR}/share/qtermwidget6 ${INSTALL_APP_DIR}/share/
205205
else
206-
echo "${INSTALL_DIR}/share/qtermwidget6 is not exist"
206+
echo_error "${INSTALL_DIR}/share/qtermwidget6 is not exist"
207207
fi
208208

209209
echo "Build AppImage ......"
@@ -233,7 +233,7 @@ if [ -n "$QMAKE" ]; then
233233
if command -v qmake >/dev/null 2>&1; then
234234
command -v qmake
235235
else
236-
echo "Please set 'QMAKE'"
236+
echo_error "Please set 'QMAKE'"
237237
fi
238238
fi
239239

‎Script/build_debpackage.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ fi
1313
INSTALL_BUILD_DEPEND=0
1414

1515
source $(dirname $(readlink -f $0))/common.sh
16+
detect_os_info
1617

1718
usage_long() {
1819
echo "$0 [-h|--help] [-v|--verbose[=0|1]] [--install=<install directory>] [--rabbitcommon<RabbitCommon directory>"
@@ -37,7 +38,7 @@ if command -V getopt >/dev/null; then
3738
OPTS=help,verbose::,install:,rabbitcommon::,install-build-depend::
3839
ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
3940
if [ $? != 0 ]; then
40-
echo "exec getopt fail: $?"
41+
log_fail "exec getopt fail: $?"
4142
exit 1
4243
fi
4344
#echo "ARGS=[$ARGS]"
@@ -128,8 +129,8 @@ BUILD_DEPS=$(/usr/bin/which mk-build-deps)
128129
BUILD_PKG=$(/usr/bin/which dpkg-buildpackage)
129130

130131
if [ -z "$BUILD_DEPS" ] || [ -z "$BUILD_PKG" ]; then
131-
echo "dpkg-buildpackage [$BUILD_PKG] and dpkg-checkbuilddeps [$BUILD_DEPS] required"
132-
echo "Install with 'sudo apt install dpkg-dev'"
132+
echo_error "dpkg-buildpackage [$BUILD_PKG] and dpkg-checkbuilddeps [$BUILD_DEPS] required"
133+
echo_error "Install with 'sudo apt install dpkg-dev'"
133134
exit 1
134135
fi
135136

‎Script/build_depend.sh‎

Lines changed: 58 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ if [ -z "$BUILD_VERBOSE" ]; then
1212
fi
1313

1414
source $(dirname $(readlink -f $0))/common.sh
15-
1615
detect_os_info
1716

1817
install_gnu_getopt
19-
if [ "$OS" = "macOS" ]; then
18+
if [ "$DISTRO" = "macOS" ]; then
2019
MACOS=1
2120
setup_macos
2221
else
@@ -512,7 +511,7 @@ esac
512511

513512

514513
if [ $SYSTEM_UPDATE -eq 1 ]; then
515-
echo "System update ......"
514+
echo "== System update ......"
516515
case "$PACKAGE_TOOL" in
517516
brew)
518517
brew update -q
@@ -531,12 +530,12 @@ if [ $SYSTEM_UPDATE -eq 1 ]; then
531530
fi
532531

533532
if [ -n "$PACKAGE" ]; then
534-
echo "Install package: $PACKAGE"
533+
echo "== Install package: $PACKAGE"
535534
package_install $PACKAGE
536535
fi
537536

538537
if [ $BASE_LIBS -eq 1 ]; then
539-
echo "Install base libraries ......"
538+
echo "== Install base libraries ......"
540539
if [ "$PACKAGE_TOOL" = "apt" ]; then
541540
# Build tools
542541
package_install build-essential devscripts equivs debhelper \
@@ -558,11 +557,8 @@ if [ $BASE_LIBS -eq 1 ]; then
558557
libxcb-cursor-dev libxcb-xkb-dev libxcb-keysyms1-dev \
559558
libxcb-* libxcb-cursor0 \
560559
libxkbcommon-dev
561-
if ! [[ $DISTRO_VERSION =~ 26\.[0-9]+ ]]; then
562-
package_install xserver-xorg-input-kbd xserver-xorg-input-mouse
563-
fi
564560
# Base dependency
565-
package_install liblzo2-dev libssl-dev libcrypt-dev libicu-dev zlib1g-dev libtelnet-dev
561+
package_install liblzo2-dev libssl-dev libcrypt-dev libicu-dev zlib1g-dev
566562
# RabbitCommon dependency
567563
package_install libcmark-dev cmark
568564
# VNC dependency
@@ -573,7 +569,15 @@ if [ $BASE_LIBS -eq 1 ]; then
573569
# PcapPlusPlus dependency
574570
package_install libpcap-dev
575571
# FFmpeg needed by QtMultimedia and freerdp
576-
package_install libavcodec-dev libavformat-dev libresample1-dev libswscale-dev
572+
package_install libavcodec-dev libavformat-dev libswscale-dev
573+
case "$DISTRO" in
574+
ubuntu|debian)
575+
package_install libresample1-dev
576+
;;
577+
deepin)
578+
package_install libswresample-dev
579+
;;
580+
esac
577581
package_install libx264-dev libx265-dev
578582
# Needed by QtMultimedia
579583
package_install pipewire
@@ -582,11 +586,10 @@ if [ $BASE_LIBS -eq 1 ]; then
582586
# Needed by AppImage and FreeRDP
583587
package_install libfuse-dev libfuse3-dev fuse
584588
# Other
585-
586-
if [ "$OS" = "ubuntu" ]; then
589+
if [ "$DISTRO" = "ubuntu" ]; then
587590
package_install libmysqlclient-dev
588591
fi
589-
if [ "$OS" = "debian" ]; then
592+
if [ "$DISTRO" = "debian" ]; then
590593
# libmysqlclient
591594
package_install libmariadb-dev libmariadb-dev-compat
592595
fi
@@ -622,7 +625,7 @@ if [ $BASE_LIBS -eq 1 ]; then
622625
fi
623626

624627
if [ $DEFAULT_LIBS -eq 1 ]; then
625-
echo "Install default dependency libraries ......"
628+
echo "== Install default dependency libraries ......"
626629
if [ "$PACKAGE_TOOL" = "apt" ]; then
627630
package_install libvncserver-dev
628631
if [ $FREERDP -ne 1 ]; then
@@ -665,7 +668,7 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
665668
fi
666669

667670
if [ $QT -eq 1 ]; then
668-
echo "Install qt ${QT_VERSION} ......"
671+
echo "== Install qt ${QT_VERSION} ......"
669672
pushd "$TOOLS_DIR"
670673
if [ ! -d qt_`uname -m` ]; then
671674
# See: https://ddalcino.github.io/aqt-list-server/
@@ -691,7 +694,7 @@ if [ $QT -eq 1 ]; then
691694
fi
692695

693696
if [ $RabbitCommon -eq 1 ]; then
694-
echo "Install RabbitCommon ......"
697+
echo "== Install RabbitCommon ......"
695698
pushd "$SOURCE_DIR"
696699
if [ ! -d RabbitCommon ]; then
697700
git clone https://github.com/KangLin/RabbitCommon.git
@@ -704,10 +707,12 @@ if [ $RabbitCommon -eq 1 ]; then
704707
fi
705708

706709
if [ $LIBSSH -eq 1 ]; then
707-
echo "Install libssh ......"
710+
echo "== Install libssh ......"
708711
pushd "$SOURCE_DIR"
709712
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/libssh ]; then
710-
git clone -b libssh-0.11.3 --depth=1 https://git.libssh.org/projects/libssh.git
713+
if [ ! -d libssh ]; then
714+
git clone -b libssh-0.11.3 --depth=1 https://git.libssh.org/projects/libssh.git
715+
fi
711716
cmake -E make_directory $BUILD_DEPEND_DIR/libssh
712717
pushd $BUILD_DEPEND_DIR/libssh
713718
cmake -S $SOURCE_DIR/libssh -DCMAKE_BUILD_TYPE=Release \
@@ -722,10 +727,12 @@ if [ $LIBSSH -eq 1 ]; then
722727
fi
723728

724729
if [ $FREERDP -eq 1 ]; then
725-
echo "Install FreeRDP ......"
730+
echo "== Install FreeRDP ......"
726731
pushd "$SOURCE_DIR"
727732
if [ ! -d ${INSTALL_DIR}/lib/cmake/FreeRDP3 ]; then
728-
git clone -b 3.24.1 --depth=1 https://github.com/FreeRDP/FreeRDP.git
733+
if [ ! -d FreeRDP ]; then
734+
git clone -b 3.24.1 --depth=1 https://github.com/FreeRDP/FreeRDP.git
735+
fi
729736
cmake -E make_directory $BUILD_DEPEND_DIR/FreeRDP
730737
pushd $BUILD_DEPEND_DIR/FreeRDP
731738
cmake -S $SOURCE_DIR/FreeRDP \
@@ -749,10 +756,12 @@ if [ $FREERDP -eq 1 ]; then
749756
fi
750757

751758
if [ $TIGERVNC -eq 1 ]; then
752-
echo "Install tigervnc ......"
759+
echo "== Install tigervnc ......"
753760
pushd "$SOURCE_DIR"
754761
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/tigervnc ]; then
755-
git clone --depth=1 https://github.com/KangLin/tigervnc.git
762+
if [ ! -d tigervnc ]; then
763+
git clone --depth=1 https://github.com/KangLin/tigervnc.git
764+
fi
756765
cmake -E make_directory $BUILD_DEPEND_DIR/tigervnc
757766
pushd $BUILD_DEPEND_DIR/tigervnc
758767
cmake -S $SOURCE_DIR/tigervnc -DCMAKE_BUILD_TYPE=Release \
@@ -768,10 +777,17 @@ if [ $TIGERVNC -eq 1 ]; then
768777
fi
769778

770779
if [ $PCAPPLUSPLUS -eq 1 ]; then
771-
echo "Install PcapPlusPlus ......"
780+
echo "== Install PcapPlusPlus ......"
772781
pushd "$SOURCE_DIR"
773782
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/pcapplusplus ]; then
774-
git clone -b v25.05 --depth=1 https://github.com/seladb/PcapPlusPlus.git
783+
if [ ! -d PcapPlusPlus ]; then
784+
# TODO: modify it
785+
if [ "$DISTRO" = "deepin" ]; then
786+
git clone --depth=1 https://github.com/KangLin/PcapPlusPlus.git
787+
else
788+
git clone -b v25.05 --depth=1 https://github.com/seladb/PcapPlusPlus.git
789+
fi
790+
fi
775791
cmake -E make_directory $BUILD_DEPEND_DIR/PcapPlusPlus
776792
pushd $BUILD_DEPEND_DIR/PcapPlusPlus
777793
cmake -S $SOURCE_DIR/PcapPlusPlus -DCMAKE_BUILD_TYPE=Release \
@@ -788,10 +804,12 @@ if [ $PCAPPLUSPLUS -eq 1 ]; then
788804
fi
789805

790806
if [ $libdatachannel -eq 1 ]; then
791-
echo "Install libdatachannel ......"
807+
echo "== Install libdatachannel ......"
792808
pushd "$SOURCE_DIR"
793809
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/LibDataChannel ]; then
794-
git clone -b v0.17.8 --depth=1 https://github.com/paullouisageneau/libdatachannel.git
810+
if [ ! -d libdatachannel ]; then
811+
git clone -b v0.17.8 --depth=1 https://github.com/paullouisageneau/libdatachannel.git
812+
fi
795813
cd libdatachannel
796814
git submodule update --init --recursive
797815
cmake -E make_directory $BUILD_DEPEND_DIR/libdatachannel
@@ -807,10 +825,12 @@ if [ $libdatachannel -eq 1 ]; then
807825
fi
808826

809827
if [ $QtService -eq 1 ]; then
810-
echo "Install QtService ......"
828+
echo "== Install QtService ......"
811829
pushd "$SOURCE_DIR"
812830
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/QtService ]; then
813-
git clone --depth=1 https://github.com/KangLin/qt-solutions.git
831+
if [ ! -d qt-solutions ]; then
832+
git clone --depth=1 https://github.com/KangLin/qt-solutions.git
833+
fi
814834
cd qt-solutions/qtservice
815835
git submodule update --init --recursive
816836
cmake -E make_directory $BUILD_DEPEND_DIR/qtservice
@@ -826,12 +846,12 @@ if [ $QtService -eq 1 ]; then
826846
fi
827847

828848
if [ $QTERMWIDGET -eq 1 ]; then
829-
echo "Install qtermwidget ......"
849+
echo "== Install qtermwidget ......"
830850
pushd "$SOURCE_DIR"
831851
#CMAKE=`/usr/bin/qtpaths6 --query QT_HOST_BINS`/qt-cmake
832852
#echo "CMAKE: $CMAKE"
833853
if [ ! -d ${INSTALL_DIR}/share/cmake/lxqt2-build-tools ]; then
834-
echo "Install lxqt-build-tools ......"
854+
echo "== Install lxqt-build-tools ......"
835855
if [ ! -d lxqt-build-tools ]; then
836856
git clone --branch 2.3.0 --depth=1 https://github.com/lxqt/lxqt-build-tools.git
837857
fi
@@ -871,10 +891,12 @@ if [ $QTERMWIDGET -eq 1 ]; then
871891
fi
872892

873893
if [ $QTKEYCHAIN -eq 1 ]; then
874-
echo "Install QtKeyChain ......"
894+
echo "== Install QtKeyChain ......"
875895
pushd "$SOURCE_DIR"
876896
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/Qt6Keychain ]; then
877-
git clone -b 0.15.0 --depth=1 https://github.com/frankosterfeld/qtkeychain.git
897+
if [ ! -d qtkeychain ]; then
898+
git clone -b 0.15.0 --depth=1 https://github.com/frankosterfeld/qtkeychain.git
899+
fi
878900
cmake -E make_directory $BUILD_DEPEND_DIR/qtkeychain
879901
pushd $BUILD_DEPEND_DIR/qtkeychain
880902
cmake -S $SOURCE_DIR/qtkeychain -DCMAKE_BUILD_TYPE=Release \
@@ -889,10 +911,12 @@ if [ $QTKEYCHAIN -eq 1 ]; then
889911
fi
890912

891913
if [ $QFtpServer -eq 1 ]; then
892-
echo "Install QFtpServer ......"
914+
echo "== Install QFtpServer ......"
893915
pushd "$SOURCE_DIR"
894916
if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/QFtpServerLib/QFtpServerLib ]; then
895-
git clone --depth=1 https://github.com/KangLin/QFtpServer.git
917+
if [ ! -d QFtpServer ]; then
918+
git clone --depth=1 https://github.com/KangLin/QFtpServer.git
919+
fi
896920
cmake -E make_directory $BUILD_DEPEND_DIR/QFtpServer
897921
pushd $BUILD_DEPEND_DIR/QFtpServer
898922
cmake -S $SOURCE_DIR/QFtpServer -DCMAKE_BUILD_TYPE=Release \

0 commit comments

Comments
 (0)