Skip to content

Commit

Permalink
Fix DLDIR default directory. Closes ilikenwf#162
Browse files Browse the repository at this point in the history
 * Set /var/cache/apt/apt-fast as default directory over
   /var/cache/apt/archives/apt-fast .

   Prevents apt warning:

    W: Problem unlinking the file apt-fast - pkgAcquire::Clean (21: Is a directory)

 * Update README and fix language in config file.
  • Loading branch information
Lasall committed Apr 9, 2019
1 parent 87fa2d1 commit 1a39bd7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ apt-fast uses APT's proxy settings (`Acquire::http::proxy`, `Acquire::https::pro

### Download folder ###
```sh
DLDIR='/var/cache/apt/archives/apt-fast'
DLDIR='/var/cache/apt/apt-fast'
```
Directory where apt-fast downloads the packages.
Directory where apt-fast (temporarily) downloads the packages.


### APT archives cache ###
Expand Down
4 changes: 2 additions & 2 deletions apt-fast
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ eval "$(apt-config shell APTCACHE Dir::Cache::archives/d)"
# Check if APT config option Dir::Cache::archives::apt-fast-partial is set.
eval "$(apt-config shell apt_fast_partial Dir::Cache::archives::apt-fast-partial/d)"
if [ -z "$apt_fast_partial" ]; then
eval "$(apt-config -o Dir::Cache::archives::apt-fast-partial=apt-fast shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
DLDIR="$(realpath "${APTCACHE}/../apt-fast")"
else
eval "$(apt-config shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
DLDIR="${apt_fast_partial}"
fi
# Currently not needed.
eval "$(apt-config shell LISTDIR Dir::State::lists/d)"
Expand Down
3 changes: 1 addition & 2 deletions apt-fast.conf
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@
#_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --header "Accept: */*"'


# Download temp folder for Downloadmanager
# example /tmp/apt-fast. Standard is /var/cache/apt-fast
# Temporary download folder for download manager.
#
# Default: /var/cache/apt/apt-fast
#
Expand Down

0 comments on commit 1a39bd7

Please sign in to comment.