aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--FAQ10
-rw-r--r--FAQ.html10
-rw-r--r--default.slapt-getrc.arm2
-rw-r--r--default.slapt-getrc.i3862
-rw-r--r--default.slapt-getrc.x86_642
-rw-r--r--doc/libslapt.32
-rw-r--r--doc/slapt-get.86
-rw-r--r--doc/slapt-get.ru.86
-rw-r--r--doc/slapt-get.uk.86
-rw-r--r--example.slapt-getrc2
-rw-r--r--example.slapt-getrc.i3862
-rw-r--r--example.slapt-getrc.x86_642
-rw-r--r--t/test_common.c4
14 files changed, 31 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index f6d6d1a..0063d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.11.0 Jun 21, 2018
+ * move default cache directory to /var/cache/slapt-get
+
0.10.2t Jul 04, 2016
* add jaos.org slackwarearm source
* 14.2 support
diff --git a/FAQ b/FAQ
index 892f190..5ac195c 100644
--- a/FAQ
+++ b/FAQ
@@ -36,7 +36,7 @@ Frequently Asked Questions:
33. How do I specify the exact version of a package to install?
34. Why is upgradepkg complaining it cannot find installpkg or removepkg, with sudo?
35. How can I specify a username/password for the connection to the package source?
-36. /var/slapt-get is growing large, how can I safely free up space?
+36. /var/cache/slapt-get is growing large, how can I safely free up space?
37. What about extra, testing, or pasture packages?
38. Can I use slapt-get to mirror packages?
39. Is there a way to use tab completion for the package names in Bash?
@@ -854,10 +854,10 @@ Frequently Asked Questions:
SOURCE=ftp://user:pass@host.org/pub/packages/
-36. /var/slapt-get is growing large, how can I safely free up space?
+36. /var/cache/slapt-get is growing large, how can I safely free up space?
Use the --clean option to remove all the cached packages from the tree within
- /var/slapt-get.
+ /var/cache/slapt-get.
Or use --autoclean, which is like clean but clears out the local repository of
retrieved package files that can no longer be downloaded, and are largely
@@ -878,7 +878,7 @@ Frequently Asked Questions:
slapt-get --available|awk '{print $1}'|xargs -r slapt-get --download-only \
--reinstall --install
- The packages will then be mirrored under ${ROOT}/var/slapt-get in the
+ The packages will then be mirrored under ${ROOT}/var/cache/slapt-get in the
directory structure they where found in. You can then generate the
PACKAGES.TXT and CHECKSUMS.md5 files using the script in FAQ #17 which would
allow you to use this mirror as a slapt-get source.
@@ -982,7 +982,7 @@ Frequently Asked Questions:
packages.
* slapt-get will not change your system such that you can only use slapt-get
or are somehow locked into using slapt-get. The only additions to your
- system are /etc/slapt-get and /var/slapt-get. You are free to try another
+ system are /etc/slapt-get and /var/cache/slapt-get. You are free to try another
solution or go back to manual upgradepkg.
* UPGRADE.TXT and ChangeLog.txt are still required reading for upgrades or
running -current.
diff --git a/FAQ.html b/FAQ.html
index 4b5c440..68a2629 100644
--- a/FAQ.html
+++ b/FAQ.html
@@ -50,7 +50,7 @@
<a href="#slgFAQ33">33. How do I specify the exact version of a package to install?</a>
<a href="#slgFAQ34">34. Why is upgradepkg complaining it cannot find installpkg or removepkg, with sudo?</a>
<a href="#slgFAQ35">35. How can I specify a username/password for the connection to the package source?</a>
-<a href="#slgFAQ36">36. /var/slapt-get is growing large, how can I safely free up space?</a>
+<a href="#slgFAQ36">36. /var/cache/slapt-get is growing large, how can I safely free up space?</a>
<a href="#slgFAQ37">37. What about extra, testing, or pasture packages?</a>
<a href="#slgFAQ38">38. Can I use slapt-get to mirror packages?</a>
<a href="#slgFAQ39">39. Is there a way to use tab completion for the package names in Bash?</a>
@@ -868,10 +868,10 @@
SOURCE=ftp://user:pass@host.org/pub/packages/
-<a name="slgFAQ36"><b>36. /var/slapt-get is growing large, how can I safely free up space?</b></a>
+<a name="slgFAQ36"><b>36. /var/cache/slapt-get is growing large, how can I safely free up space?</b></a>
Use the --clean option to remove all the cached packages from the tree within
- /var/slapt-get.
+ /var/cache/slapt-get.
Or use --autoclean, which is like clean but clears out the local repository of
retrieved package files that can no longer be downloaded, and are largely
@@ -892,7 +892,7 @@
slapt-get --available|awk '{print $1}'|xargs -r slapt-get --download-only \
--reinstall --install
- The packages will then be mirrored under ${ROOT}/var/slapt-get in the
+ The packages will then be mirrored under ${ROOT}/var/cache/slapt-get in the
directory structure they where found in. You can then generate the
PACKAGES.TXT and CHECKSUMS.md5 files using the script in <a href="#slgFAQ17">FAQ #17</a> which would
allow you to use this mirror as a slapt-get source.
@@ -996,7 +996,7 @@
packages.
* slapt-get will not change your system such that you can only use slapt-get
or are somehow locked into using slapt-get. The only additions to your
- system are /etc/slapt-get and /var/slapt-get. You are free to try another
+ system are /etc/slapt-get and /var/cache/slapt-get. You are free to try another
solution or go back to manual upgradepkg.
* UPGRADE.TXT and ChangeLog.txt are still required reading for upgrades or
running -current.
diff --git a/default.slapt-getrc.arm b/default.slapt-getrc.arm
index 9fa64f9..a11413a 100644
--- a/default.slapt-getrc.arm
+++ b/default.slapt-getrc.arm
@@ -1,5 +1,5 @@
# Working directory for local storage/cache.
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
diff --git a/default.slapt-getrc.i386 b/default.slapt-getrc.i386
index ce637dd..7ea425f 100644
--- a/default.slapt-getrc.i386
+++ b/default.slapt-getrc.i386
@@ -1,5 +1,5 @@
# Working directory for local storage/cache.
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
diff --git a/default.slapt-getrc.x86_64 b/default.slapt-getrc.x86_64
index a366fc0..eac291c 100644
--- a/default.slapt-getrc.x86_64
+++ b/default.slapt-getrc.x86_64
@@ -1,5 +1,5 @@
# Working directory for local storage/cache.
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
diff --git a/doc/libslapt.3 b/doc/libslapt.3
index 0a64274..c955a9f 100644
--- a/doc/libslapt.3
+++ b/doc/libslapt.3
@@ -13,7 +13,7 @@ slapt_rc_config *config = slapt_read_rc_config("/etc/slapt-get/slapt-getrc");
/* get a list of installed packages */
slapt_pkg_list_t *installed = slapt_get_installed_pkgs();
/* parse the package data, normally using config->working_dir */
-FILE *data_f = fopen("/var/slapt-get/package_data","r");
+FILE *data_f = fopen("/var/cache/slapt-get/package_data","r");
slapt_pkg_list_t *available = slapt_parse_packages_txt(data_f);
/* search for a package in a list via regex */
diff --git a/doc/slapt-get.8 b/doc/slapt-get.8
index 0f0444e..b92441c 100644
--- a/doc/slapt-get.8
+++ b/doc/slapt-get.8
@@ -58,7 +58,7 @@ tries to emulate Debian's apt-get as closely as possible.
.TP
\fB\-\-download\-only\fR, \fB\-d\fR
Download the package only. Do not install/upgrade. Packages are downloaded to
-.IR /var/slapt-get/ .
+.IR /var/cache/slapt-get/ .
.TP
\fB\-\-simulate\fR, \fB\-s\fR
Will not install or download packages.
@@ -162,7 +162,7 @@ current sources.
List installed packages only.
.TP
\fB\-\-clean\fR
-Purge cached/downloaded packages from WORKINGDIR (\fI/var/slapt-get/\fR
+Purge cached/downloaded packages from WORKINGDIR (\fI/var/cache/slapt-get/\fR
by default).
.TP
\fB\-\-autoclean\fR
@@ -196,7 +196,7 @@ Untested updates are risky, whether using official packages or third party packa
.PP
\fBslapt-get\fR will not change your system such that you can only use
\fBslapt-get\fR or are somehow locked into using \fBslapt-get\fR. The only
-additions to your system are \fI/etc/slapt-get\fR and \fI/var/slapt-get\fR.
+additions to your system are \fI/etc/slapt-get\fR and \fI/var/cache/slapt-get\fR.
You are free to try another solution or go back to manual \fBupgradepkg\fR(8).
.PP
\fIUPGRADE.TXT\fR and \fIChangeLog.txt\fR is still required reading, the latter
diff --git a/doc/slapt-get.ru.8 b/doc/slapt-get.ru.8
index c735608..ee77578 100644
--- a/doc/slapt-get.ru.8
+++ b/doc/slapt-get.ru.8
@@ -59,7 +59,7 @@ slapt-get \- фронт-энд для pkgtools
.TP
\fB\-\-download\-only\fR, \fB\-d\fR
Только загрузить пакет. Не производить установку/обновление. Пакеты загружаются в
-.IR /var/slapt-get/ .
+.IR /var/cache/slapt-get/ .
.TP
\fB\-\-simulate\fR, \fB\-s\fR
Симуляция. Не устанавливать и не скачивать пакеты.
@@ -161,7 +161,7 @@ dist-upgrade убедитесь, что обновлён кэш пакетов и наиболее важные пакеты
.TP
\fB\-\-clean\fR
Удалить кэшированные/загруженные пакеты из каталога WORKINGDIR (по умолчанию это
-\fI/var/slapt-get/\fR).
+\fI/var/cache/slapt-get/\fR).
.TP
\fB\-\-autoclean\fR
Как и \fB\-\-clean\fR, autoclean очищает локальный репозиторий полученных пакетов.
@@ -197,7 +197,7 @@ dist-upgrade убедитесь, что обновлён кэш пакетов и наиболее важные пакеты
\fBslapt-get\fR не вносит в систему изменений, способных привести к тому, что
вы не сможете использовать для каких-либо задач ничего, кроме \fBslapt-get\fR.
В конфигурацию системы добавляются только \fI/etc/slapt-get\fR и
-\fI/var/slapt-get\fR. Ничто не мешает вам использовать другое решение или
+\fI/var/cache/slapt-get\fR. Ничто не мешает вам использовать другое решение или
использовать \fBupgradepkg\fR(8) вручную.
.PP
Файлы \fIUPGRADE.TXT\fR и \fIChangeLog.txt\fR всё равно стоит читать, особенно
diff --git a/doc/slapt-get.uk.8 b/doc/slapt-get.uk.8
index 314705c..cdea364 100644
--- a/doc/slapt-get.uk.8
+++ b/doc/slapt-get.uk.8
@@ -126,7 +126,7 @@ slapt-get \- фронт-енд для pkgtools
.SH ОПЦ╤╥
.TP
.B --download-only
-Т╕льки завантажити пакет. Не робити всстановлення/оновлення. Пакети завантажуються у /var/slapt-get/.
+Т╕льки завантажити пакет. Не робити всстановлення/оновлення. Пакети завантажуються у /var/cache/slapt-get/.
.TP
.B --simulate|-s
Симуляц╕я. Не встановлювати та не завантажувати пакети.
@@ -206,7 +206,7 @@ Install specified disk set(s). example: --install-set xap n l
Перел╕чити т╕льки встановлен╕ пакети.
.TP
.B --clean
-Видалити кешован╕/завантажен╕ пакети з робочого каталогу WORKINGDIR (стандартно /var/slapt-get/).
+Видалити кешован╕/завантажен╕ пакети з робочого каталогу WORKINGDIR (стандартно /var/cache/slapt-get/).
.TP
.B --autoclean
Як ╕ --clean, autoclean очищу╓ локальний репозитор╕й одержаних пакет╕в. Р╕зниця в тому, що будуть видален╕ т╕льки т╕ пакети, як╕ вже не можуть бути завантажен╕, ╕ загалом в╕д них нема корист╕. Це дозволя╓ утримувати кеш довгий час, не даючи йому бесконтрольно розростатись.
@@ -226,7 +226,7 @@ slapt-get буде намагатись задов╕льнити залежност╕ та розр╕шити конфл╕кти т╕льки
.TP
Неперев╕рен╕ оновлення ризикован╕ як при використанн╕ пакет╕в в╕д сторонн╕х розробник╕в, так ╕ при використанн╕ оф╕ц╕йних пакет╕в.
.TP
-slapt-get не вносить у систему зм╕н, здатних привести до того, що ви не зможете використовувати для якихось задач н╕чого, кр╕м slapt-get. В конф╕гурац╕ю системи додаються т╕льки /etc/slapt-get та /var/slapt-get. Н╕що не заважа╓ вам використовувати ╕нше р╕шення або використовувати upgradepkg вручну.
+slapt-get не вносить у систему зм╕н, здатних привести до того, що ви не зможете використовувати для якихось задач н╕чого, кр╕м slapt-get. В конф╕гурац╕ю системи додаються т╕льки /etc/slapt-get та /var/cache/slapt-get. Н╕що не заважа╓ вам використовувати ╕нше р╕шення або використовувати upgradepkg вручну.
.TP
Варто також прочитати UPGRADE.TXT та ChangeLog.txt; особливо ChangeLog.txt, якщо у вас рел╕з -current.
diff --git a/example.slapt-getrc b/example.slapt-getrc
index b11fb8f..a3849ab 100644
--- a/example.slapt-getrc
+++ b/example.slapt-getrc
@@ -1,5 +1,5 @@
# working directory, local storage/cache
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# exclude package names and expressions
diff --git a/example.slapt-getrc.i386 b/example.slapt-getrc.i386
index 1db8a4f..83ead8a 100644
--- a/example.slapt-getrc.i386
+++ b/example.slapt-getrc.i386
@@ -1,5 +1,5 @@
# Working directory for local storage/cache.
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
diff --git a/example.slapt-getrc.x86_64 b/example.slapt-getrc.x86_64
index 915501f..d3bafcb 100644
--- a/example.slapt-getrc.x86_64
+++ b/example.slapt-getrc.x86_64
@@ -1,5 +1,5 @@
# Working directory for local storage/cache.
-WORKINGDIR=/var/slapt-get
+WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
diff --git a/t/test_common.c b/t/test_common.c
index 29b6c49..9d5181a 100644
--- a/t/test_common.c
+++ b/t/test_common.c
@@ -35,10 +35,10 @@ END_TEST
START_TEST (test_slapt_create_dir_structure)
{
- const char *dir_name = "var/slapt-get";
+ const char *dir_name = "var/cache/slapt-get";
DIR *d = NULL;
- slapt_create_dir_structure("var/slapt-get");
+ slapt_create_dir_structure("var/cache/slapt-get");
d = opendir(dir_name);