diff --git a/make-deb.sh b/make-deb.sh index fcd78b9..8f63c4f 100755 --- a/make-deb.sh +++ b/make-deb.sh @@ -121,7 +121,8 @@ echo "Section: utils" >> ./deb-contents/DEBIAN/control echo "Priority: optional" >> ./deb-contents/DEBIAN/control echo "Architecture: $DEBIAN_DEB_ARCH" >> ./deb-contents/DEBIAN/control echo "Maintainer: CongTianKong (gitee.com/CongTianKong)" >> ./deb-contents/DEBIAN/control -echo "Depends: bubblewrap, bash, coreutils, shared-mime-info, xdg-utils, transhell" >> ./deb-contents/DEBIAN/control +echo "Depends: bubblewrap, bash, coreutils, shared-mime-info, xdg-utils" >> ./deb-contents/DEBIAN/control +echo "Recommends: transhell" >> ./deb-contents/DEBIAN/control echo "Description: A script to run programs with newer libc." >> ./deb-contents/DEBIAN/control echo " package built with make-deb.sh from additional-base-lib project." >> ./deb-contents/DEBIAN/control echo " libc6 download URL: $LIBC6_DOWNLOAD_URL" >> ./deb-contents/DEBIAN/control @@ -144,6 +145,7 @@ check $? echo "copy transhell i18n scripts..." mkdir -p ./deb-contents/usr/share/ablrun/transhell cp ./scripts/transhell/ablrun_* ./deb-contents/usr/share/ablrun/transhell/ +check $? echo "generate ablrun-normal script..." echo "#!/bin/bash" > ./deb-contents/usr/bin/ablrun-normal diff --git a/scripts/ablrun b/scripts/ablrun index b15dc9d..ca51efa 100755 --- a/scripts/ablrun +++ b/scripts/ablrun @@ -1,7 +1,12 @@ #!/bin/bash -source /opt/durapps/transhell/transhell.sh -load_transhell +if [ -x "/opt/durapps/transhell/transhell.sh" ] +then + source /opt/durapps/transhell/transhell.sh + load_transhell +else + source /usr/share/ablrun/transhell/ablrun_en_US.transhell +fi if [ "$*" = "" ] then