diff --git a/dunst/package.sh b/dunst/package.sh index a99f618..79ee7d6 100755 --- a/dunst/package.sh +++ b/dunst/package.sh @@ -1,11 +1,12 @@ #!/bin/bash app_name="dunst" -version="1.12.2" -release="${version}-1" +version="1.13.0" +release="${version}" pkg_arch="x64" deb_arch="amd64" tmp_dir="/data/docker/${app_name}-${version}" +build_dir="${tmp_dir}/build" if [ -d "./unpack" ]; then @@ -28,22 +29,26 @@ mkdir -p "./unpack/etc/xdg/dunst" echo "复制编译好的文件到待打包目录..." -cp -rv "${tmp_dir}/dunst" "./unpack/usr/bin/" +cp -rv "${build_dir}/src/dunst" "./unpack/usr/bin/" cp -rv "${tmp_dir}/dunstctl" "./unpack/usr/bin/" -cp -rv "${tmp_dir}/dunstify" "./unpack/usr/bin/" +cp -rv "${build_dir}/dunstify" "./unpack/usr/bin/" cp -rv "${tmp_dir}/dunstrc" "./unpack/etc/xdg/dunst/" -cp -rv "${tmp_dir}/dunst.systemd.service" "./unpack/usr/lib/systemd/user/dunst.service" +cp -rv "${tmp_dir}/dunst.systemd.service.in" "./unpack/usr/lib/systemd/user/dunst.service" echo """[Install] WantedBy=default.target """ >> "./unpack/usr/lib/systemd/user/dunst.service" +sed -i "s|@bindir@|/usr/bin|g" "./unpack/usr/lib/systemd/user/dunst.service" + mkdir -p "./unpack/usr/share/dbus-1/services" -cp -rv "${tmp_dir}/org.knopwob.dunst.service" "./unpack/usr/share/dbus-1/services/" +cp -rv "${build_dir}/dunst.service" "./unpack/usr/share/dbus-1/services/" + +sed -i "s|local/||g" "./unpack/usr/share/dbus-1/services/dunst.service" mkdir -p "./unpack/usr/share/bash-completion/completions" mkdir -p "./unpack/usr/share/zsh/site-functions" @@ -62,9 +67,9 @@ cp -rv "${tmp_dir}/completions/dunstify.fishcomp" "./unpack/usr/share/fish/vendo mkdir -p "./unpack/usr/share/man/man1" mkdir -p "./unpack/usr/share/man/man5" -tar -zcvf ./unpack/usr/share/man/man1/dunst.1.gz "${tmp_dir}/docs/dunst.1" -tar -zcvf ./unpack/usr/share/man/man1/dunstctl.1.gz "${tmp_dir}/docs/dunstctl.1" -tar -zcvf ./unpack/usr/share/man/man5/dunst.5.gz "${tmp_dir}/docs/dunst.5" +tar -zcvf ./unpack/usr/share/man/man1/dunst.1.gz "${build_dir}/docs/dunst.1" +tar -zcvf ./unpack/usr/share/man/man1/dunstctl.1.gz "${build_dir}/docs/dunstctl.1" +tar -zcvf ./unpack/usr/share/man/man5/dunst.5.gz "${build_dir}/docs/dunst.5" echo "复制完成, 压缩可执行文件..." strip -s "./unpack/usr/bin/dunst" @@ -111,5 +116,5 @@ sudo chown -R root:root unpack dpkg-deb -b ./unpack "./${app_name}-${deb_arch}_${version}.deb" sudo rm -rf ./unpack -sudo rm -rf $tmp_dir +# sudo rm -rf $tmp_dir echo "打包完成 :)"