lxc-download: Tweak cache location

- Also include the variant in the path - Fix invalid LXC_CACHE_BASE - Drop redundant code Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

lxc-download: Tweak cache location
b56661fe · Stéphane Graber · 6849cb5b · b56661fe
Commit b56661fe authored Jan 26, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

lxc-download.in templates/lxc-download.in +5 -5

No files found.
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -327,15 +327,15 @@ fi
 # Setup the cache
 if [ "$DOWNLOAD_MODE" = "system" ]; then
-    LXC_CACHE_BASE="$LOCALSTATEDIR/cache/"
+    LXC_CACHE_BASE="$LOCALSTATEDIR/cache/lxc/"
-    LXC_CACHE_PATH="$LOCALSTATEDIR/cache/lxc/download/$DOWNLOAD_DIST"
-    LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH"
 else
    LXC_CACHE_BASE="$HOME/.cache/lxc/"
-    LXC_CACHE_PATH="$HOME/.cache/lxc/download/$DOWNLOAD_DIST"
-    LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH"
 fi
+LXC_CACHE_PATH="$LXC_CACHE_BASE/download/$DOWNLOAD_DIST"
+LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_RELEASE/$DOWNLOAD_ARCH/"
+LXC_CACHE_PATH="$LXC_CACHE_PATH/$DOWNLOAD_VARIANT"
 if [ -d "$LXC_CACHE_PATH" ]; then
    if [ "$DOWNLOAD_FLUSH_CACHE" = "true" ]; then
        echo "Flushing the cache..."