@@ -367,10 +367,20 @@ if [ $DOCKER -eq 1 ]; then
367367 cp \$ {SOURCE_CODE_DIR}/rabbitremotecontrol*.deb /home/build/
368368 "
369369 fi
370+
370371 if [ $APPIMAGE -eq 1 ]; then
371- if [[ " $DOCKER_IMAGE " =~ ^(ubuntu| debian) ]]; then
372+ # if [[ "$DOCKER_IMAGE" =~ ^(ubuntu|debian) ]]; then
373+ # DOCKER_PARA="-e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
374+ # fi
375+ case " $DISTRO " in
376+ ubuntu|debian)
372377 DOCKER_PARA=" -e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
373- fi
378+ ;;
379+ fedora)
380+ # Install getopt
381+ dnf install -y util-linux
382+ ;;
383+ esac
374384 docker run --privileged ${DOCKER_PARA} \
375385 -e CI=${CI} \
376386 --volume ${REPO_ROOT} :/home/RabbitRemoteControl \
@@ -398,6 +408,7 @@ if [ $DOCKER -eq 1 ]; then
398408 popd
399409 "
400410 fi
411+
401412 if [ $RPM -eq 1 ]; then
402413 docker run --volume ${BUILD_LINUX_DIR} :/home/build \
403414 --volume ${INSTALL_DIR} :/home/install \
@@ -467,6 +478,8 @@ if [ $APPIMAGE -eq 1 ]; then
467478 depend_para=" $depend_para --freerdp --libssh --qtermwidget --qtkeychain --qftpserver"
468479 ;;
469480 fedora)
481+ depend_para=" $depend_para --package-tool=dnf --qftpserver "
482+ # dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitremotecontrol.spec
470483 ;;
471484 * )
472485 esac
496509
497510if [ $RPM -eq 1 ]; then
498511 echo " build rpm package ......"
499- dnf builddep -y ${REPO_ROOT} /Package/rpm/rabbitremotecontrol.spec
512+ # dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitremotecontrol.spec
500513 ./build_depend.sh --system_update --base --default --package-tool=dnf \
501514 --rabbitcommon --tigervnc --pcapplusplus --qftpserver \
502515 --install=${INSTALL_DIR} \
0 commit comments