summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--FAQ18
-rw-r--r--FAQ.html18
-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--po/cs.po7
-rw-r--r--po/de.po7
-rw-r--r--po/el.po7
-rw-r--r--po/en.po7
-rw-r--r--po/es.po7
-rw-r--r--po/es_ES.po7
-rw-r--r--po/fr.po7
-rw-r--r--po/it.po7
-rw-r--r--po/nl.po7
-rw-r--r--po/no.po7
-rw-r--r--po/pl.po7
-rw-r--r--po/pt_BR.po7
-rw-r--r--po/pt_PT.po5
-rw-r--r--po/ru.po7
-rw-r--r--po/sk.po7
-rw-r--r--po/sl.po7
-rw-r--r--po/slapt-get.pot7
-rw-r--r--po/sv.po7
-rw-r--r--po/uk.po7
-rw-r--r--po/vi.po5
-rw-r--r--src/main.c45
-rw-r--r--src/main.h4
28 files changed, 180 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index d4caf27..197daab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.9.10d Sep 21, 2005
+0.9.10d Sep 22, 2005
+ * introduced --install-set option to install whole disk sets
* fixed naming of data cache file for uncompressed PACKAGES.TXT
* updated the package data download to save on disk i/o
* created a doc/ directory for the man pages
diff --git a/FAQ b/FAQ
index 1ba978f..20bea04 100644
--- a/FAQ
+++ b/FAQ
@@ -182,9 +182,8 @@ Frequently Asked Questions:
packages already installed will be upgraded. To accomplish this, you can
specify slapt-get to install a disk set like so:
- ### install all gnome and X packages
- $ slapt-get --search '^./slackware/gnome$|^./slackware/x$'|awk '{print $1}'| \
- xargs -r slapt-get --install
+ ### install all X and X application packages
+ $ slapt-get --install-set x xap
Do the same for all your installed disk sets, such as gnome, x, xap, l, n, etc.
@@ -273,7 +272,7 @@ Frequently Asked Questions:
with. Here is how to install every package that is available but not
currently installed:
- slapt-get --available|grep inst=no|awk '{print $1}'|sort|uniq|xargs -r slapt-get --install
+ slapt-get --available|grep inst=no|awk '{print $1}'|uniq|xargs -r slapt-get --install
14. What if I only want to upgrade one package?
@@ -413,15 +412,12 @@ Frequently Asked Questions:
18. How can I download every package in a disk set?
- You can search the package location field, which specifies which directory
- the package resides in, on the mirror.
+ You can use the install-set option to install all of the packages within a
+ disk set.
- To install every package from xap, search for the ./slackware/xap disk set:
+ To install every package from xap:
- slapt-get --search '^\.\/slackware\/xap$'|awk '{print $1}'| \
- xargs -r slapt-get --install
-
- You will have to pass -y when you are happy with the results.
+ slapt-get --install-set xap
19. How can I add dependency information to my packages?
diff --git a/FAQ.html b/FAQ.html
index 2bc7078..c51c4dd 100644
--- a/FAQ.html
+++ b/FAQ.html
@@ -196,9 +196,8 @@
packages already installed will be upgraded. To accomplish this, you can
specify slapt-get to install a disk set like so:
- ### install all gnome and X packages
- $ slapt-get --search '^./slackware/gnome$|^./slackware/x$'|awk '{print $1}'| \
- xargs -r slapt-get --install
+ ### install all X and X application packages
+ $ slapt-get --install-set x xap
Do the same for all your installed disk sets, such as gnome, x, xap, l, n, etc.
@@ -287,7 +286,7 @@
with. Here is how to install every package that is available but not
currently installed:
- slapt-get --available|grep inst=no|awk '{print $1}'|sort|uniq|xargs -r slapt-get --install
+ slapt-get --available|grep inst=no|awk '{print $1}'|uniq|xargs -r slapt-get --install
<a name="slgFAQ14"><b>14. What if I only want to upgrade one package?</b></a>
@@ -427,15 +426,12 @@
<a name="slgFAQ18"><b>18. How can I download every package in a disk set?</b></a>
- You can search the package location field, which specifies which directory
- the package resides in, on the mirror.
+ You can use the install-set option to install all of the packages within a
+ disk set.
- To install every package from xap, search for the ./slackware/xap disk set:
+ To install every package from xap:
- slapt-get --search '^\.\/slackware\/xap$'|awk '{print $1}'| \
- xargs -r slapt-get --install
-
- You will have to pass -y when you are happy with the results.
+ slapt-get --install-set xap
<a name="slgFAQ19"><b>19. How can I add dependency information to my packages?</b></a>
diff --git a/doc/slapt-get.8 b/doc/slapt-get.8
index 6f0f0d5..3ae1252 100644
--- a/doc/slapt-get.8
+++ b/doc/slapt-get.8
@@ -77,6 +77,9 @@ slapt-get \- frontend to pkgtools
.B --install
]
[
+.B --install-set
+]
+[
.B --remove
]
[
@@ -169,6 +172,9 @@ Upgrade to newer Slackware release. This is the same as --upgrade, with the add
.B --install [package(s)]
Install specified package(s). Packages can be package names or package names with version (example: pkg-1.0-i386-1).
.TP
+.B --install-set [disk set(s)]
+Install specified disk set(s). example: --install-set xap n l
+.TP
.B --remove [package(s)]
Remove specified package(s). Packages can be package names or package names with version (example: pkg-1.0-i386-1).
.TP
diff --git a/doc/slapt-get.ru.8 b/doc/slapt-get.ru.8
index f47cfd7..870b406 100644
--- a/doc/slapt-get.ru.8
+++ b/doc/slapt-get.ru.8
@@ -77,6 +77,9 @@ slapt-get \- - pkgtools
.B --install
]
[
+.B --install-set
+]
+[
.B --remove
]
[
@@ -171,6 +174,9 @@ slapt-get \- - pkgtools
.B --install [()]
. , (, pkg-1.0-i386-1).
.TP
+.B --install-set [disk set(s)]
+Install specified disk set(s). example: --install-set xap n l
+.TP
.B --remove [()]
. , (, pkg-1.0-i386-1).
.TP
diff --git a/doc/slapt-get.uk.8 b/doc/slapt-get.uk.8
index 2e0d631..f0609bb 100644
--- a/doc/slapt-get.uk.8
+++ b/doc/slapt-get.uk.8
@@ -77,6 +77,9 @@ slapt-get \- - pkgtools
.B --install
]
[
+.B --install-set
+]
+[
.B --remove
]
[
@@ -171,6 +174,9 @@ slapt-get \- - pkgtools
.B --install [()]
Φ . ' , ' Ӧ (, pkg-1.0-i386-1).
.TP
+.B --install-set [disk set(s)]
+Install specified disk set(s). example: --install-set xap n l
+.TP
.B --remove [()]
Φ . ' , ' Ӧ (, pkg-1.0-i386-1).
.TP
diff --git a/po/cs.po b/po/cs.po
index 7c2f0be..423630d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/de.po b/po/de.po
index f4498dd..38b134e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Niklas Volbers <mithrandir42@web.de>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/el.po b/po/el.po
index 7c98444..d17b68f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,9 +5,9 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Savvas Eftratiadis <pigouinos@mailworks.org.\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -473,3 +473,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/en.po b/po/en.po
index 0da16f7..c0d6d06 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/es.po b/po/es.po
index 630e12f..b5a11f1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/es_ES.po b/po/es_ES.po
index e216887..300e45b 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/fr.po b/po/fr.po
index 05775fa..7b3fdda 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-31 11:04+0400\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translators: Verachten Bruno <gounthar@gmail.com>, solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/it.po b/po/it.po
index 8e32ac6..079e84b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
#,fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Francesco Gigli <jaramir@slack.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/nl.po b/po/nl.po
index 6da1b54..f5f01a3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Stefan Koopmanschap <stefan@electronicmusicworld.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/no.po b/po/no.po
index f7c63e7..c17d8d0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Joran Kvalvaag <jk@nerdworks.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/pl.po b/po/pl.po
index 9d3bc23..da8d12d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 10:23+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translators: Sajmon <sajmon@tenboard.com>, Paul Blazejowski <paulb@blazebox.homeip.net>, nixon <nixon@klub.chip.pl> and simon <ssiimm@poczta.onet.pl>\n"
"Language-Team: polish slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "Okrel liczb prb powtrzenia pobrania"
msgid "install package, do not attempt to upgrade"
msgstr "zainstaluj pakiet, nie prbuj go aktualizowa"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6d1562a..09c7dd4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Henrique Pinto <henrique.pinto@kdemail.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -473,3 +473,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b4fda9b..a36fa20 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-04 17:34+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Miguel Santinho <msantinho@simplicidade.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -473,3 +473,6 @@ msgstr "especifique o nmero de tentativas para download"
msgid "install package, do not attempt to upgrade"
msgstr "instale o pacote, no tente actualiz-lo"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/ru.po b/po/ru.po
index 622e11a..44ab8b1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2005-09-07 23:24 EEST\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr " "
msgid "install package, do not attempt to upgrade"
msgstr " , "
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/sk.po b/po/sk.po
index 420ba5a..cbab970 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2005-06-23 21:28+0500\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Erik Gyepes <depi@depi.sk>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/sl.po b/po/sl.po
index 69eefd2..8744f09 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2005-03-09\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Uros Trsavec <utrsav@walla.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/slapt-get.pot b/po/slapt-get.pot
index a291170..f0fb131 100644
--- a/po/slapt-get.pot
+++ b/po/slapt-get.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10b\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-09 11:42+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr ""
msgid "install package, do not attempt to upgrade"
msgstr ""
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr ""
+
diff --git a/po/sv.po b/po/sv.po
index 4b4d8ce..f4bc477 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-08-27 01:32+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Joel Bjurman <ypolt@lediga.st>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "specify number of download retry attempts"
msgid "install package, do not attempt to upgrade"
msgstr "install package, do not attempt to upgrade"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/uk.po b/po/uk.po
index e2e0c19..3db538d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10c\n"
+"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2005-09-07 23:24 EEST\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -474,3 +474,6 @@ msgstr "֦ ˦˦ "
msgid "install package, do not attempt to upgrade"
msgstr " , "
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/po/vi.po b/po/vi.po
index 1e2aad6..873cbec 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.10d\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-05 10:37+0500\n"
+"PO-Revision-Date: 2005-09-22 12:13+0500\n"
"Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n"
"Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -475,3 +475,6 @@ msgstr "chỉ định số lần kết nối lại với kho lưu trữ khi bị
msgid "install package, do not attempt to upgrade"
msgstr "cài đặt mới, không nâng cấp"
+msgid "[disk set(s)] - install specified disk set(s)"
+msgstr "[disk set(s)] - install specified disk set(s)"
+
diff --git a/src/main.c b/src/main.c
index 117420f..05d9b78 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,6 +63,7 @@ int main( int argc, char *argv[] )
{"available", 0, 0, SLAPT_AVAILABLE_OPT},
{"retry", 1, 0, SLAPT_RETRY_OPT},
{"no-upgrade", 0, 0, SLAPT_NO_UPGRADE_OPT},
+ {"install-set", 0, 0, SLAPT_INSTALL_DISK_SET_OPT},
{0, 0, 0, 0},
};
@@ -197,6 +198,9 @@ int main( int argc, char *argv[] )
case SLAPT_AVAILABLE_OPT: /* show available packages */
do_action = AVAILABLE;
break;
+ case SLAPT_INSTALL_DISK_SET_OPT: /* install a disk set */
+ do_action = INSTALL_DISK_SET;
+ break;
default:
usage();
slapt_free_rc_config(global_config);
@@ -208,6 +212,7 @@ int main( int argc, char *argv[] )
/* Check optionnal arguments presence */
switch(do_action) {
case INSTALL:
+ case INSTALL_DISK_SET:
case REMOVE:
case SHOW:
case SEARCH:
@@ -252,6 +257,45 @@ int main( int argc, char *argv[] )
slapt_pkg_action_install( global_config, paa );
slapt_free_pkg_action_args(paa);
break;
+ case INSTALL_DISK_SET:
+ {
+ unsigned int set_i;
+ struct slapt_pkg_list *set_pkgs = slapt_init_pkg_list();
+ struct slapt_pkg_list *avail_pkgs = slapt_get_available_pkgs();
+
+ while (optind < argc) {
+ unsigned int search_i;
+ struct slapt_pkg_list *matches = NULL;
+ char *search = slapt_malloc(sizeof *search * (strlen(argv[optind]) + 3));
+ snprintf(search,strlen(argv[optind]) + 3,"/%s$",argv[optind]);
+ matches = slapt_search_pkg_list(avail_pkgs,search);
+ free(search);
+ for (search_i = 0; search_i < matches->pkg_count; ++search_i) {
+ slapt_add_pkg_to_pkg_list(set_pkgs,matches->pkgs[search_i]);
+ }
+ slapt_free_pkg_list(matches);
+ ++optind;
+ }
+
+ paa = slapt_init_pkg_action_args(set_pkgs->pkg_count);
+
+ for (set_i = 0; set_i < set_pkgs->pkg_count; ++set_i) {
+ paa->pkgs[paa->count] = slapt_malloc(
+ ( strlen(set_pkgs->pkgs[set_i]->name) + 1 ) * sizeof *paa->pkgs[paa->count]
+ );
+ memcpy(paa->pkgs[paa->count],set_pkgs->pkgs[set_i]->name,
+ strlen(set_pkgs->pkgs[set_i]->name) + 1);
+ ++paa->count;
+ }
+
+ slapt_free_pkg_list(set_pkgs);
+ slapt_free_pkg_list(avail_pkgs);
+
+ slapt_pkg_action_install( global_config, paa );
+ slapt_free_pkg_action_args(paa);
+
+ }
+ break;
case REMOVE:
paa = slapt_init_pkg_action_args((argc - optind));
while (optind < argc) {
@@ -321,6 +365,7 @@ void usage(void)
printf(" --upgrade - %s\n",gettext("upgrade installed pkgs"));
printf(" --dist-upgrade - %s\n",gettext("upgrade to newer release"));
printf(" --install %s\n",gettext("[pkg name(s)] - install specified pkg(s)"));
+ printf(" --install-set %s\n",gettext("[disk set(s)] - install specified disk set(s)"));
printf(" --remove %s\n",gettext("[pkg name(s)] - remove specified pkg(s)"));
printf(" --show %s\n",gettext("[pkg name] - show pkg description"));
printf(" --search %s\n",gettext("[expression] - search available pkgs"));
diff --git a/src/main.h b/src/main.h
index 5da934c..91884c3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -49,12 +49,14 @@
enum slapt_action {
USAGE = 0, UPDATE, INSTALL, REMOVE, SHOW, SEARCH, UPGRADE,
- LIST, INSTALLED, CLEAN, SHOWVERSION, AUTOCLEAN, AVAILABLE
+ LIST, INSTALLED, CLEAN, SHOWVERSION, AUTOCLEAN, AVAILABLE,
+ INSTALL_DISK_SET
};
#define SLAPT_UPDATE_OPT 'u'
#define SLAPT_UPGRADE_OPT 'g'
#define SLAPT_INSTALL_OPT 'i'
+#define SLAPT_INSTALL_DISK_SET_OPT 'D'
#define SLAPT_REMOVE_OPT 'r'
#define SLAPT_SHOW_OPT 's'
#define SLAPT_SEARCH_OPT 'e'