diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | aria2cd-install | 39 | ||||
| -rw-r--r--[-rwxr-xr-x] | notify-user | 12 |
4 files changed, 12 insertions, 52 deletions
@@ -1,7 +1,7 @@ pkgbase = aria2cd pkgdesc = A systemd Service to start aria2 automatically. pkgver = 1.2 - pkgrel = 2 + pkgrel = 3 url = https://aur.archlinux.org/packages/aria2cd arch = any license = custom:WTFPL @@ -11,15 +11,13 @@ pkgbase = aria2cd source = tracker-config.sh source = update-aria2-tracker source = notify-user - source = aria2cd-install source = aria2cd.hook source = aria2.conf source = aria2@.service source = LICENSE::http://www.wtfpl.net/txt/copying sha256sums = 85f465f6f32a1713f65c389b57f81d26cecfb1e7baf06c38f6b9477818fc4f85 sha256sums = b83e17eccd9d93f46e63622e479782b63ab142d816617d5b1dffe0baa66d4f1d - sha256sums = 5dd14105fcd2224c60103e5521922af0ddcb2a9ec2ef1734b092d946100019f6 - sha256sums = 68416b3df5a44c8b953b7d15f554056f21acaca7c6e3353e97c7b44fc6c322ca + sha256sums = 832238f364e518f66492ddf19b8b6b573847b216ffaa4bd30dceb36c7d325c56 sha256sums = 79e7fad888a53769776f691d3ce14bd29fc617bb58267304a9b04aa6ccbf4cf5 sha256sums = d3dc278eeddbc910c775124bf474aa2c68b7bbba30226f6322ffc2c457785d27 sha256sums = 334c0e9eed1a09cd1f44da4323a61aa79a3c4f2d51bec8a948c3d922867a5b1f @@ -2,7 +2,7 @@ pkgname=aria2cd pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A systemd Service to start aria2 automatically." arch=(any) url="https://aur.archlinux.org/packages/aria2cd" @@ -14,7 +14,6 @@ source=( tracker-config.sh update-aria2-tracker notify-user - aria2cd-install ${pkgname}.hook aria2.conf aria2@.service @@ -22,8 +21,7 @@ source=( ) sha256sums=('85f465f6f32a1713f65c389b57f81d26cecfb1e7baf06c38f6b9477818fc4f85' 'b83e17eccd9d93f46e63622e479782b63ab142d816617d5b1dffe0baa66d4f1d' - '5dd14105fcd2224c60103e5521922af0ddcb2a9ec2ef1734b092d946100019f6' - '68416b3df5a44c8b953b7d15f554056f21acaca7c6e3353e97c7b44fc6c322ca' + '832238f364e518f66492ddf19b8b6b573847b216ffaa4bd30dceb36c7d325c56' '79e7fad888a53769776f691d3ce14bd29fc617bb58267304a9b04aa6ccbf4cf5' 'd3dc278eeddbc910c775124bf474aa2c68b7bbba30226f6322ffc2c457785d27' '334c0e9eed1a09cd1f44da4323a61aa79a3c4f2d51bec8a948c3d922867a5b1f' @@ -39,6 +37,5 @@ package(){ install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 "${srcdir}/${pkgname}.hook" "${pkgdir}/usr/share/libalpm/hooks/${pkgname}.hook" install -Dm755 "${srcdir}/notify-user" "${pkgdir}/usr/share/libalpm/scripts/notify-user" - install -Dm755 "${srcdir}/aria2cd-install" "${pkgdir}/usr/bin/aria2cd-install" install -Dm755 "${srcdir}/update-aria2-tracker" "${pkgdir}/usr/bin/update-aria2-tracker" } diff --git a/aria2cd-install b/aria2cd-install deleted file mode 100644 index ba6c46009498..000000000000 --- a/aria2cd-install +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env sh -if [[ $UID -eq 0 ]] -then - echo -e "\033[31mWARN\033[0m:You are running this script on root user" -fi -read -p "Are you sure to install aria2cd? (y/N):" REPLY -REPLY=${REPLY:0:1} -if [[ ${REPLY^} != "Y" ]] -then - echo "Exited installation." - exit 0 -fi -if [[ -z XDG_CONFIG_HOME ]] -then - mkdir -p $XDG_CONFIG_HOME/aria2 - cp -n /usr/share/aria2/aria2.conf $XDG_CONFIG_HOME/aria2/aria2.conf - TARGET=$XDG_CONFIG_HOME/aria2/aria2.conf -else - mkdir -p $HOME/.config/aria2 - cp -n /usr/share/aria2/aria2.conf $HOME/.config/aria2/aria2.conf - TARGET=$HOME/.config/aria2/aria2.conf -fi -echo "Cpoied Aria2 config to ${TARGET}" -if [[ -z XDG_CACHE_HOME ]] -then - mkdir -p $XDG_CACHE_HOME/aria2 - cp -n /usr/share/aria2/dht.dat $XDG_CACHE_HOME/aria2/dht.dat - cp -n /usr/share/aria2/dht6.dat $XDG_CACHE_HOME/aria2/dht6.dat - cp -n /usr/share/aria2/aria2.session $XDG_CACHE_HOME/aria2/aria2.session - TARGET=$XDG_CACHE_HOME/aria2 -else - mkdir -p $HOME/.cache/aria2 - cp -n /usr/share/aria2/dht.dat $HOME/.cache/aria2/dht.dat - cp -n /usr/share/aria2/dht6.dat $HOME/.cache/aria2/dht6.dat - cp -n /usr/share/aria2/aria2.session $HOME/.cache/aria2/aria2.session - TARGET=$HOME/.cache/aria2 -fi -echo "Copied Aria2 cache files to ${TARGET}" -unset REPLY diff --git a/notify-user b/notify-user index d44f678f46b8..b52ee4bbb290 100755..100644 --- a/notify-user +++ b/notify-user @@ -1,7 +1,11 @@ #!/usr/bin/env sh + echo "aria2cd has been installed/updated successfully, but there is something extra to do." -echo "You can run aria2cd-install to do it automatically or do the follow manually:" -echo "You need to copy /usr/share/aria2/ to \${HOME}/.aria2/ or aria2c will not work correctly." -echo "\${HOME} is the home directory of the user who runs aria2c" -echo "You can also use \${XDG_CONFIG_HOME}/aria2/ instead of \${HOME}/.aria2/ for config and \${XDG_CACHE_HOME}/aria2/ for cache files such as DHT file and session file." +echo "" +echo "There are two options:" +echo "1. You need to copy /usr/share/aria2/ to \${HOME}/.aria2/ or aria2c will not work correctly." +echo " \${HOME} is the home directory of the user who runs aria2c" +echo "2. Copy aria2.conf and tracker-config.sh in /usr/share/aria2 to \${XDG_CONFIG_HOME:-\${HOME}/.config}/aria2/" +echo " Copy aria2.session, dht.dat and dnt6.dat in /usr/share/aria2 to \${XDG_CACHE_HOME:-\${HOME}/.config}/aria2/" +echo "" echo "The latter(\${XDG_CACHE_HOME}/aria2/ and \${XDG_CONFIG_HOME}/aria2/) is preferered to use because it follows freedesktop's specification." |