Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Documentation and messages suggestions #2

Merged
merged 5 commits into from

3 participants

@idlemoor

Hi Matteo,

I've just started to use slackpkg+ and it is awesome!

To say 'thank you' I have tried to review all the documentation and messages (e.g. echo commands) for typos, spelling etc. Then I did a big reformat on src/README, I hope you like it, but it's not really different to your version - you already wrote everything important, and in the right order too!

If you don't use any of these suggestions that is cool! I haven't suggested any changes to the code, because it's perfect! :)

Thanks for a great addition to Slackware's tools - I think slackpkgplus will improve the whole ecosystem, because it makes it practical for people to use repositories in the same way as Ubuntu PPA's etc. (Sorry to mention Ubuntu ;-)

Best wishes
-Dave Spencer

idlemoor added some commits
@idlemoor idlemoor Typos and minor edits of messages (part 1)
 - README.TXT: minor edit
 - src/doinst.sh: minor change to postinstall message
 - src/repositories.txt: minor edits
 - src/slack-desc: use same text as README.TXT; tweak handy-ruler
 - src/slackpkgplus.sh: minor edits in comments and echo messages
29b0376
@idlemoor idlemoor Typos and minor edits (part 2)
 - src/README: Typos, reword a few paragraphs
46493a3
@idlemoor idlemoor Typos and minor edits (part 3)
 - setupmultilib.sh: typos in echo messages
ca10521
@idlemoor idlemoor Typos and minor edits (part 4)
 - src/slackpkgplus.x86.sample and src/slackpkgplus.x86_64.sample:
   minor edits in comments
b20ab98
@idlemoor idlemoor src/README: reformatted. 24f6782
@mrossini

You are welcome.
My english is very bad.
I will accept that commits.

Thankyou.

@idlemoor
@zuno zuno merged commit 24f6782 into zuno:master
@mrossini

merged into 2d207c0

it will be packaged at the next release (will be a stable? ;) )

thankyou

@idlemoor idlemoor deleted the unknown repository branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 28, 2013
  1. @idlemoor

    Typos and minor edits of messages (part 1)

    idlemoor authored
     - README.TXT: minor edit
     - src/doinst.sh: minor change to postinstall message
     - src/repositories.txt: minor edits
     - src/slack-desc: use same text as README.TXT; tweak handy-ruler
     - src/slackpkgplus.sh: minor edits in comments and echo messages
  2. @idlemoor

    Typos and minor edits (part 2)

    idlemoor authored
     - src/README: Typos, reword a few paragraphs
  3. @idlemoor

    Typos and minor edits (part 3)

    idlemoor authored
     - setupmultilib.sh: typos in echo messages
  4. @idlemoor

    Typos and minor edits (part 4)

    idlemoor authored
     - src/slackpkgplus.x86.sample and src/slackpkgplus.x86_64.sample:
       minor edits in comments
Commits on Oct 29, 2013
  1. @idlemoor

    src/README: reformatted.

    idlemoor authored
This page is out of date. Refresh to see the latest.
View
6 README.TXT
@@ -2,7 +2,7 @@ slackpkg+ plugin for third-party repositories
Slackpkg is a package manager for Slackware.
-Slackpkg+ is a plugin for slackpkg
- It add support for third-party repositories.
- You can add multiple repository to your list
+Slackpkg+ is a plugin for slackpkg.
+ It adds support for third-party repositories.
+ You can install, upgrade and search from multiple repositories.
View
328 src/README
@@ -1,12 +1,13 @@
slackpkg+ plugin for third-party repositories
-Slackpkg is a package manager for Slackware.
-
-Slackpkg+ is a plugin for slackpkg
+Slackpkg is a package manager for Slackware.
+
+Slackpkg+ is a plugin for slackpkg.
It adds support for third-party repositories.
- You can add multiple repositories to your list
+ You can install, upgrade and search from multiple repositories.
-Thanks to alienbob and phenixia2003 for contributing and all other submitted suggestions and/or patches.
+Thanks to alienbob and phenixia2003 for contributing and all other submitted
+suggestions and/or patches.
********************* DISCLAIMER **********************
This is NOT an official tool. Use it at your own risk.
@@ -16,204 +17,295 @@ for any damage that may be caused to your computer.
*******************************************************
-----
-*Configuration:
-edit slackpkgplus.conf
-uncomment one or more mirrors and add it in the REPOPLUS list.
-Optionally set PKGS_PRIORITY to give priority order for packages present in multiple repositories
-For supported repository see repositories.txt.
-but you can add other yourself.
-If you configure repositories that do not support gpg, you may need to set "CHECKGPG=off" in slackpkg.conf
+CONFIGURATION
+
+* Edit /etc/slackpkg/slackpkgplus.conf
+* Uncomment one or more mirrors and add them to the REPOPLUS list
+* Optionally, set PKGS_PRIORITY to give priority order for packages present in
+ multiple repositories
+For a list of supported repositories see repositories.txt, but you can also
+add others yourself.
-then launch
-slackpkg update gpg
-slackpkg update
+If you configure repositories that do not support gpg, you may need to set
+"CHECKGPG=off" in /etc/slackpkg/slackpkg.conf
+Then launch
+# slackpkg update gpg
+# slackpkg update
-To keep slackpkg+ updated, uncomment the 'slackpkgplus' repository.
-then 'slackpkg upgrade-all' will upgrade it.
+To keep slackpkg+ updated, uncomment the 'slackpkgplus' repository, and then
+# slackpkg upgrade-all
+will upgrade slackpkg+ whenever a new version is released.
-----
-the MIRRORPLUS array define all mirrors. It accepts a lot of protocols:
-1) http/ftp/https:
- MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64/
- the mirror must contains all metadata files (CHECKSUMS.md5 ...)
- you must run 'slackpkg update' after add/remove a repository
-2) local mirror:
- MIRRORPLUS['alienlocal']=file://mirrors/alienbob/x86/14.0/
- the directory must contains all metadata files (CHECKSUMS.md5 ...)
- you must run 'slackpkg update' after add/remove a repository
-3) local packages directory:
- MIRRORPLUS['mypackages']=dir://mypackages/
- all packages must to be in a single directory (subdirectory not allowed)
- 'slackpkg update' ignore these repository. Every time you run slackpkg
- it read the directory contents.
+MIRRORPLUS
+The MIRRORPLUS array defines all mirrors. It accepts these protocols:
------
+1) http/ftp/https: for example,
+
+ MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64/
+
+ The mirror must contains all metadata files (CHECKSUMS.md5 ...)
+ You must run 'slackpkg update' after adding/removing a repository.
+2) Local mirror: for example,
-Usage:
+ MIRRORPLUS['alienlocal']=file://mirrors/alienbob/x86/14.0/
-see 'man slackpkg' :D
+ The directory must contains all metadata files (CHECKSUMS.md5 ...)
+ You must run 'slackpkg update' after adding/removing a repository.
-use 'slackpkg upgrade-all' to keep your system up-to-date.
-This command searches for upgraded packages spanning all configured repositories.
+3) Local packages directory: for example,
-use 'slackpkg install-new' (if you use current) to check for new packages.
-This command searches new packages ONLY in official slackware repository.
+ MIRRORPLUS['mypackages']=dir://mypackages/
+
+ All packages must be in a single directory (subdirectory not allowed).
+ Note that 'slackpkg update' ignores these repositories. Every time you run
+ slackpkg, it reads the directory contents.
-the command
-slackpkg {install,upgrade,remove,reinstall}
-accept:
-1) package-name (span all repositories)
-2) part of package-name (span all repositories)
-3) path of package in repository, for example slackpkg install xap - span all repositories
-4a) repository-name, for example slackpkg upgrade alienbob - upgrade packages from specified repository
-4b) repository-name, for example slackpkg install ktown - install all packages in ktown repository
-5) repository-name:package-name, for example slackpkg install slacky:openjdk - install slacky openjdk even if that repository is not the first one in order
-6) file:local-file-name (txz/tgz), for example slackpkg install file:mypackage-1.0-noarch-1my.txz - install mypackage even if not defined in slackpkgplus.con; you can optionally specify relative or absolute path
-7) dir:directory, for example slackpkg {install|upgrade} dir:/root/myrepo (do not strictly require the final '/') - install or upgrade all packages in path (note: 'slackpkg install .' is an alias of 'slackpkg install dir:./', but 'slackpkg install ./' is NOT the same alias; search FILE in man slackpkg)
-----
-priority configuration:
-When a package is present in more than one repository the package will be searched found in the following order:
+USAGE
+
+See 'man slackpkg' :D
+
+Use the command
+# slackpkg upgrade-all
+to keep your system up-to-date. This command searches for upgraded packages
+spanning all configured repositories.
+
+Use the command
+# slackpkg install-new
+(if you use Slackware -current) to check for new packages. This command
+searches for new packages ONLY in the official Slackware repository.
+
+The command
+# slackpkg {install,upgrade,remove,reinstall}
+accepts the following kinds of argument:
+
+1) package-name (spanning all repositories), for example
+ # slackpkg install bsd-games
+
+2) part of package-name (spanning all repositories), for example
+ # slackpkg install alsa
+
+3) path of packages in repository (spanning all repositories), for example
+ # slackpkg install xap
+
+4) repository-name, for example
+ # slackpkg upgrade alienbob
+ upgrades all packages in the alienbob repository, and
+ # slackpkg install ktown
+ installs all packages in the ktown repository
+
+5) repository-name:package-name, for example
+ # slackpkg install slacky:openjdk
+ installs openjdk from slacky even if there is another openjdk in another
+ repository
+
+6) file:local-file-name (txz/tgz), for example
+ # slackpkg install file:mypackage-1.0-noarch-1my.txz
+ installs mypackage even though not defined in slackpkgplus.conf
+ (you can specify either a relative or an absolute path)
+
+7) dir:directory, for example
+ # slackpkg {install|upgrade} dir:/root/myrepo
+ installs or upgrades all packages in /root/myrepo/
+ (The final '/' is not strictly required.)
+ Note: 'slackpkg install .' is an alias of 'slackpkg install dir:./', but
+ 'slackpkg install ./' is NOT the same alias; see FILE in man slackpkg
+
+-----
+
+
+PRIORITY CONFIGURATION
+
+When a package is present in more than one repository, the package will be
+searched for in the following order:
1) as listed in PKGS_PRIORITY
-2) as listed in Official Slackware Repository (as configured in slackpkg.conf)
+2) as listed in an official Slackware repository
+ (configured in /etc/slackpkg/mirrors)
3) as listed in REPOPLUS
-4) all other defined in MIRRORPLUS
+4) all others defined in MIRRORPLUS
-PKGS_PRIORITY Syntax:
+PKGS_PRIORITY syntax:
+ PKGS_PRIORITY=( <repository name>:<package name> ... )
-<repository name>:<package name>
+for example:
+ PKGS_PRIORITY=( alienbob:openjdk )
-example:
-alienbob:openjdk
-
-<package name> accepts regular expression, so
-restricted:.* mean 'all packages in repository restricted'
+<package name> accepts a regular expression, so for example
+ PKGS_PRIORITY=( restricted:.* )
+means 'all packages in repository restricted'
-----
-MULTILIB:
-If you want to use a multilib system you must configure the multilib repository in slackpkgplus.conf
-You can do that simply by running:
+MULTILIB
+
+If you want to use a multilib system, you can automatically configure the
+multilib repository in slackpkgplus.conf and install multilib simply by running:
# /usr/doc/slackpkg+-1.0/setupmultilib.sh
-Otherwise you can configure it manually:
-Add the repository 'multilib', add "PKGS_PRIORITY=( multilib:.* )" then launch:
+To configure multilib manually (e.g. if you have installed multilib already),
+uncomment the correct "MIRRORPLUS['multilib']=...",
+and uncomment "PKGS_PRIORITY=( multilib:.* )",
+and add multilib to the REPOPLUS list.
+To install multilib manually, launch:
# slackpkg update gpg
# slackpkg update
# slackpkg upgrade-all
# slackpkg install multilib
-next:
+After that, you can keep multilib up-to-date by launching:
# slackpkg update
# slackpkg upgrade-all
-re-run 'slackpkg install multilib' if you found that 'slackpkg install-new' has found some new package.
+and re-running 'slackpkg install multilib' if 'slackpkg install-new' has found
+any new packages.
-to remove the multilib, you must remove 'multilib:.*' from PKGS_PRIORITY and from REPOPLUS (but not delete related MIRRORPLUS line), then launch:
+To uninstall multilib, you must remove 'multilib:.*' from PKGS_PRIORITY and from
+REPOPLUS (but do not delete the related MIRRORPLUS line), then launch:
# slackpkg update
# slackpkg remove multilib
-Note: that does NOT remove the core multilib packages becouse they affect the 64bit system, so you must remove these by launch:
+Note: this does NOT remove the core multilib packages, because they affect the
+64bit system. You must remove these by launching:
# slackpkg upgrade-all
-then delete or comment the related MIRRORPLUS line and launch:
+then delete or comment the related MIRRORPLUS line, and finally launch
# slackpkg update
-----
-NEWEST KDE:
-If you want to install the latest kde package from alienbob (presently 4.11.1), add "PKGS_PRIORITY=( ktown:.* )" then launch:
+KTOWN (LATEST KDE)
-the first time:
+If you want to install the latest KDE packages from AlienBOB's ktown repository
+(presently 4.11.1), add "PKGS_PRIORITY=( ktown:.* )" then launch:
# slackpkg update gpg
# slackpkg update
# slackpkg install ktown
# slackpkg upgrade-all
-do not forget to read the special instruction from http://taper.alienbase.nl/mirrors/alien-kde/current/latest/ becouse you may need to remove some kde-slackware package. At the time of writing:
+Do not forget to read the special instructions from
+ http://taper.alienbase.nl/mirrors/alien-kde/current/latest/
+because you may need to remove some Slackware KDE packages. At the time of
+writing, these packages are:
# slackpkg remove kdeadmin kdenetwork kdesdk kdetoys
-next:
+After that, you can keep the ktown KDE up-to-date by launching:
# slackpkg update
# slackpkg upgrade-all
-to upgrade to 4.11.2 or more.
-to restore slackware kde:
-remove 'ktown:.*' from PKGS_PRIORITY and from REPOPLUS (but not delete related MIRRORPLUS line)
+To restore the Slackware KDE, remove 'ktown:.*' from PKGS_PRIORITY and from
+REPOPLUS (but do not delete the related MIRRORPLUS line), then launch:
# slackpkg update
# slackpkg upgrade-all
# slackpkg install kde
# slackpkg remove ktown
-then delete or comment the related MIRRORPLUS line and then launch:
+then delete or comment the related MIRRORPLUS line and launch:
# slackpkg update
-----
-PERSONAL PACKAGES:
-If you build yourself some packages, you can install these without installpkg, by using slackpkg. This operation helps you to track the installation/upgrade and reduce the error margin. You do NOT need to create a your personal repository, generating a gpg-key and all needed metadata any time you build a package; also yo do NOT need to modify your config file and launch slackpkg update.
-
-You can:
-1) install/upgrade/reinstall a single package by passing the full file name (optionally add absolute or relative path):
-# slackpkg install file:package-1.0-noarch-1my.txz
-or
-# slackpkg upgrade file:../repo/package-2.0-noarch-1my.txz
-2) install/upgrade/reinstall all file packages in a single directory (does not allow subtree) by passing a directory name (optionally absolute or relative path):
-# slackpkg install dir:/myrep
-# slackpkg upgrade dir:./test/package/
-# slackpkg reinstall .
-'.' is an alias of 'dir:./', but only that alias exists. slackpkg install ./ or /myrepo/ or ./package.txz generates an error becouse in standard slackpkg you can specify a FILE as input, so in 'slackpkg install ./list.txt' list.txt must to be a plain file containing a list of packages to install (see man slackpkg)
-If a directory contains the same package with two different version, slackpkg show the 'alfabetically' highest, so pkg-9.1 will be listed instead of pkg-8, ut pkg-9 will be also listed instead pkg-10. Sorry.. is a slackpkg limit!
+PERSONAL PACKAGES
-Tip: if you want to use dir:/myrepo to track your installations and you have lost the original txz/tgz file, you can simply create an empty file; this fools slackpkg+ that only searches for file name and not for contents (unless you do not run slackpkg reinstall on these packages ;))
+If you build some packages yourself, you can install these without
+installpkg, by using slackpkg+. This helps you to track the install/upgrade,
+and reduces the possibility of errors. You do NOT need to create a personal
+repository with a gpg-key and metadata every time you build a package; also
+you do NOT need to modify your slackpkgplus.conf file or launch 'slackpkg
+update'.
-by doing
-# touch mypkg1-1.0-noarch-1my.tgz
-# touch mysecondpkg-1.1-noarch-2my.txz
-where mypkg1 and mysecondpkg are already installed packages, 'slackpkg install .' (or upgrade) does not show you that packages. 'slackpkg reinstall .' DOES show it (so do not continue the installation)
+You can:
-NOTE: slackpkg+ will skip the gpg and md5 check!!
+1) install/upgrade/reinstall a single package by passing the full file name
+ (optionally with absolute or relative path), for example
+ # slackpkg install file:package-1.0-noarch-1my.txz
+ or
+ # slackpkg upgrade file:../repo/package-2.0-noarch-1my.txz
+
+2) install/upgrade/reinstall all packages in a single directory (but not in a
+ subtree) by passing a directory name (optionally with absolute or relative
+ path), for example
+ # slackpkg install dir:/myrep
+ or
+ # slackpkg upgrade dir:./test/package/
+ or
+ # slackpkg reinstall .
+
+ Note: '.' is an alias of 'dir:./', but only that alias exists.
+ 'slackpkg install ./' (or /myrepo/ or ./package.txz) generates an error,
+ because in standard slackpkg you can specify a FILE as input, so in
+ 'slackpkg install ./list.txt' list.txt must be a plain file containing a list
+ of packages to install (see man slackpkg)
+
+ If a directory contains the same package with two different versions,
+ slackpkg shows the 'alphabetically' highest, so pkg-9.1 will be listed
+ instead of pkg-8, but pkg-9 will be listed instead of pkg-10.
+ Sorry... this is a slackpkg limitation!
+
+ Tip: if you want to use dir:/myrepo to track your installations and you have
+ lost the original txz/tgz file, you can simply create an empty file; this
+ fools slackpkg+, which only searches for file name and not for contents
+ (unless you run slackpkg reinstall on these packages ;)) So, by doing
+ # touch mypkg1-1.0-noarch-1my.tgz
+ # touch mysecondpkg-1.1-noarch-2my.txz
+ (where mypkg1 and mysecondpkg are already installed packages),
+ 'slackpkg install .' (or upgrade) does not show you those packages, but
+ 'slackpkg reinstall .' DOES show them (so do not continue the installation)
+
+NOTE: slackpkg+ will skip the gpg and md5 check for personal packages!!
-----
-REMOTE PACKAGES WITHOUT METADATA:
-Some users share packages on his personal site but without creating metadata files (specially if they share few packages).
-To install one of these packages you should download it and install it manually.
-Now you can specify a direct url for the package with slackpkg+ that will automatically download and install/upgrade the package.
+
+REMOTE PACKAGES WITHOUT METADATA
+
+Some users share packages on their personal sites, but do not create metadata
+files (particularly if they share only a few packages). To install one of these
+packages, you could download it and install it manually. But now with slackpkg+
+you can specify a direct URL for the package that will automatically download
+and install/upgrade the package.
You can:
+
1) install/upgrade/reinstall a single package by specifying the complete url:
-# slackpkg install http://site/path/package-1.0-noarch-1my.txz
-You may use that function to install a snapshot of slackpkg+ (that is not available with slackpkg upgrade slackpkg becouse is a beta version)
-# slackpkg upgrade http://www.slakfinder.org/slackpkg+/pkg/slackpkg+-20130905.2-noarch-1mt.txz
-2) install/upgrade/reinstall all file packages in a single remote directory (does not allow subtree):
-With the same syntax 'slackpkg install dir:..' you can specify a url-path:
-# slackpkg install http://site/path/
-even if the site owner does not create metadata.
-That function requires lftp and may fail if the server does not support Directory Listing or if there is a index.html in the path.
+ # slackpkg install http://site/path/package-1.0-noarch-1my.txz
+ For example, you may use this function to install a snapshot of slackpkg+
+ (that is not available with 'slackpkg upgrade slackpkg+' because it is a beta
+ version):
+ # slackpkg upgrade http://www.slakfinder.org/slackpkg+/pkg/slackpkg+-20130905.2-noarch-1mt.txz
+2) install/upgrade/reinstall all packages in a single remote directory (but not
+ in a subtree) even if the site owner does not create metadata:
+ # slackpkg install http://site/path/
-NOTE: slackpkg+ will skip the gpg and md5 check!!
+ Note: this function requires lftp and may fail if the server does not support
+ Directory Listing or if there is a index.html in the path.
-------
+NOTE: slackpkg+ will skip the gpg and md5 check for remote packages without
+metadata!!
-The AlienBob article about slackpkg+:
-http://alien.slackbook.org/blog/introducing-slackpkg-an-extension-to-slackpkg-for-3rd-party-repositories/
+------
-For questions, suggestions or contributes, you can email me to zerouno@slacky.it or use the linuxquestions forum:
-http://www.linuxquestions.org/questions/showthread.php?p=4940074
+FURTHER INFORMATION
+The AlienBOB article about slackpkg+:
+ http://alien.slackbook.org/blog/introducing-slackpkg-an-extension-to-slackpkg-for-3rd-party-repositories/
-You can find slackpkg+ on sourceforge: https://sourceforge.net/projects/slackpkgplus
+For questions, suggestions or contributions, you can email me at
+zerouno@slacky.it or use the linuxquestions forum:
+ http://www.linuxquestions.org/questions/showthread.php?p=4940074
+You can find slackpkg+ on sourceforge:
+ https://sourceforge.net/projects/slackpkgplus
View
4 src/doinst.sh
@@ -40,8 +40,8 @@ remove var/lib/slackpkg/ChangeLog.txt
remove var/lib/slackpkg/pkglist
echo
echo
-echo "Please, read the README file before use it"
+echo "Please, read the README file before using slackpkg+"
echo
-echo "Now you must to rerun 'slackpkg update'"
+echo "Now you must rerun 'slackpkg update'"
echo
View
8 src/repositories.txt
@@ -10,11 +10,11 @@ Supported Repositories:
> zerouno: http://www.z01.eu/repo-slack/slackware64-current/
> mled: http://www.microlinux.fr/slackware/MLED-{14.0,14.1}-{32,64}bit/
> mles: http://www.microlinux.fr/slackware/MLES-{14.0,14.1}-{32,64}bit/
-> mles: http://www.microlinux.fr/slackware/MLWS-{14.0,14.1}-{32,64}bit/
+> mlws: http://www.microlinux.fr/slackware/MLWS-{14.0,14.1}-{32,64}bit/
> msb: http://slackware.org.uk/msb/{14.0,14.1}/1.6/{x86,x86_64}/
> slackers: http://www.slackers.it/repository/
>
-> Does NOT supports GPG
+> Does NOT support GPG
> salixos(*): http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/
> salixext: http://people.salixos.org/ralvex/repository/x86_64/14.0/
> rlworkman: http://rlworkman.net/pkgs/{13.37,14.0}/
@@ -22,10 +22,10 @@ Supported Repositories:
(*) salixos partially supports GPG. This repository contains the .asc file for CHECKSUMS.md5,
so the 'update' process works with CHECKGPG=on and repository authenticity is guaranteed.
- Unfortunatly the single packages does not contains the relative .asc file, so you must
+ Unfortunately the single packages do not include the related .asc file, so you must
install the packages with 'slackpkg -checkgpg=off install <packagename>', but the
authenticity is guaranteed by the md5 authenticity.
-You can found a larger list at http://slakfinder.org
+You can find a larger list at http://slakfinder.org
View
10 src/setupmultilib.sh
@@ -13,7 +13,7 @@ if [ $ISX64 -ne 1 ];then
fi
SVER=$(grep -v ^\# /etc/slackpkg/mirrors|sed -r 's,^.*/slackware64-(current|14.1|14.0|13.37|13.0)/,\1,'|head -1)
if [ -z "$SVER" ];then
- echo "I can't detect you Slackware version."
+ echo "I can't detect your Slackware version."
echo "Which Slackware version are you running? (current/14.1/14.0/13.37/13.0)"
read $SVER
fi
@@ -23,7 +23,7 @@ if ! echo $SVER|egrep -q '^(current|14.1|14.0|13.37|13.0)$';then
fi
if grep -q -e '^PKGS_PRIORITY=.* multilib:\.\* .*$' -e '^MIRRORPLUS..multilib..=.*multilib.*' /etc/slackpkg/slackpkgplus.conf;then
- echo "slackpkg+ seem to be already configured for multilib support. Would you like to remove multilib support from the configuration? (y/N)"
+ echo "slackpkg+ seems to be already configured for multilib support. Would you like to remove multilib support from the configuration? (y/N)"
read ANS
if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
cp /etc/slackpkg/slackpkgplus.conf /etc/slackpkg/slackpkgplus.conf.backup
@@ -33,7 +33,7 @@ if grep -q -e '^PKGS_PRIORITY=.* multilib:\.\* .*$' -e '^MIRRORPLUS..multilib..=
-e 's/^(MIRRORPLUS..multilib..=.*multilib.*)$/#\1/' \
-e 's/^REPOPLUS=(.*) multilib (.*)/REPOPLUS=\1 \2/' \
-e 's/^(REPOPLUS=\( +\).*)$/#\1/' /etc/slackpkg/slackpkgplus.conf
- echo "multilib support has been removed from slackpkg+. Now you need to remove the installed packages (using slackpkg)."
+ echo "Multilib support has been removed from slackpkg+. Now you need to remove the installed packages (using slackpkg)."
echo "Would you like this script to run slackpkg for you and remove the Multilib packages? (y/N)"
read ANS
if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
@@ -55,7 +55,7 @@ if grep -q -e '^PKGS_PRIORITY=.* multilib:\.\* .*$' -e '^MIRRORPLUS..multilib..=
fi
fi
-echo "Would you setup slackpkg+ to add multilib support? (y/N)"
+echo "Would you like to setup slackpkg+ to add multilib support? (y/N)"
read ANS
if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
MULTILIBREPO="MIRRORPLUS['multilib']="$(grep -m1 '> multilib: ' repositories.txt|awk '{print $3}'|sed "s/{.*}/$SVER/")
@@ -68,7 +68,7 @@ if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
sed -i -r -e 's|^(REPOPLUS=.*)$|\1\n'"$MULTILIBREPO|" /etc/slackpkg/slackpkgplus.conf
sed -i.backup -r -e 's/^(\[0-9\]\+compat32)$/\#\1/' /etc/slackpkg/blacklist
echo "slackpkg+ is now configured for multilib support."
- echo "Do you want to install then multilib now? (y/N)"
+ echo "Do you want to install the multilib now? (y/N)"
read ANS
if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
slackpkg update gpg
View
14 src/slack-desc
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-handy-ruler------------------------------------------------------|
+ |-handy-ruler------------------------------------------------------|
slackpkg+: slackpkg+ plugin for third-party repositories
slackpkg+:
slackpkg+: Slackpkg is a package manager for Slackware.
-slackpkg+:
-slackpkg+: Slackpkg+ is a plugin for slackpkg
-slackpkg+: It add support for third-party repositories.
-slackpkg+: You can add multiple repository to your list
-slackpkg+:
-slackpkg+:
+slackpkg+:
+slackpkg+: Slackpkg+ is a plugin for slackpkg.
+slackpkg+: It adds support for third-party repositories.
+slackpkg+: You can install, upgrade and search from multiple repositories.
+slackpkg+:
+slackpkg+:
slackpkg+:
slackpkg+:
View
18 src/slackpkgplus.sh
@@ -1,10 +1,10 @@
# Thanks to AlienBob and phenixia2003 (on LQ) for contributing
-# A secial thanks to all packagers that make slackpkg+ useful
+# A special thanks to all packagers that make slackpkg+ useful
declare -A MIRRORPLUS
if [ -e /etc/slackpkg/slackpkgplus.conf ];then
- # You can ovverride SLACKPKGPLUS VERBOSE USEBL from command-line
+ # You can override SLACKPKGPLUS VERBOSE USEBL from command-line
EXTSLACKPKGPLUS=$SLACKPKGPLUS
EXTVERBOSE=$VERBOSE
EXTUSEBL=$USEBL
@@ -77,8 +77,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo
echo " !!! N O T I C E !!!"
echo " Repository '$PREPO' does not contains MANIFEST.bz2"
- echo " Don't worry.. it will works fine, but the commands"
- echo " 'slackpkg file-search' will not works on that"
+ echo " Don't worry... it will work fine, but the command"
+ echo " 'slackpkg file-search' will not work on that"
echo " repository"
echo
sleep 3
@@ -111,8 +111,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo
echo " !!! N O T I C E !!!"
echo " Repository '$PREPO' does support signature checking for"
- echo " CHECKSUMS.md5 file so the repository authenticity is guaranteed"
- echo " but you MAY need to temporary disable gpg check when you"
+ echo " CHECKSUMS.md5 file, so the repository authenticity is guaranteed,"
+ echo " but you MAY need to temporarily disable gpg check when you"
echo " install the packages using:"
echo " 'slackpkg -checkgpg=off install packge'"
echo " The package authenticity remains guaranteed."
@@ -127,9 +127,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if [ $(checkgpg ${TMPDIR}/CHECKSUMS.md5-$PREPO) -ne 1 ];then
echo
echo " !!! F A T A L !!!"
- echo " Repository '$PREPO' FAILS to check CHECKSUMS.md5 signature"
+ echo " Repository '$PREPO' FAILS the CHECKSUMS.md5 signature check"
echo " The file may be corrupted or the gpg key may be not valid."
- echo " Remember to import keys launching 'slackpkg update gpg'."
+ echo " Remember to import keys by launching 'slackpkg update gpg'."
echo
sleep 5
echo > ${TMPDIR}/CHECKSUMS.md5
@@ -328,7 +328,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
touch ${TMPDIR}/waiting
# -- PKGLIST:
- # temporary file used to store data about packages. It use
+ # temporary file used to store data about packages. It uses
# the following format:
# repository:<repository_name>:basename:<package_basename>:
#
View
12 src/slackpkgplus.x86.sample
@@ -7,29 +7,29 @@ SLACKPKGPLUS=on
# set to '2' to show always show the download bar
VERBOSE=1
-# Enable (1) / Disable (0) the official slackpkg blacklist. May be useful to temporary skip
-# the slackware blacklist. You can also ovverride it from command line:
+# Enable (1) / Disable (0) the official slackpkg blacklist. May be useful to temporarily skip
+# the slackware blacklist. You can also override it from command line:
# 'USEBL=0 slackpkg upgrade-all'
USEBL=1
# If two or more repositories contains some same packages, you can specify
# from which repository you prefer to search it.
# The syntax is "<repository_name>:<package_name>"
-# Accepts regular expressions. To give order to an entire repository use "<repository_name>:.*"
+# Accepts regular expressions. To give priority to an entire repository use "<repository_name>:.*"
# Examples:
#PKGS_PRIORITY=( restricted:vlc )
#PKGS_PRIORITY=( myrepo:.* )
#
-# List repository you want to use (defined below).
+# List repositories you want to use (defined below).
# remember to launch 'slackpkg update' if you modify that row.
REPOPLUS=( slackpkgplus restricted alienbob slacky )
# Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS)
-# Note: only multilib,alienbob,restricted,slacky repositories does supports GPG. If you add other
+# Note: only multilib,alienbob,restricted,slacky repositories support GPG. If you add others
# you may need to disable gpg check in slackpkg.conf
# Slackware 14.1 - i386
@@ -37,7 +37,7 @@ MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14
MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86/
MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.1/
-# use this to keep updated the slackpkg+ package
+# use this to keep the slackpkg+ package updated
MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/
View
12 src/slackpkgplus.x86_64.sample
@@ -7,15 +7,15 @@ SLACKPKGPLUS=on
# set to '2' to show always show the download bar
VERBOSE=1
-# Enable (1) / Disable (0) the official slackpkg blacklist. May be useful to temporary skip
-# the slackware blacklist. You can also ovverride it from command line:
+# Enable (1) / Disable (0) the official slackpkg blacklist. May be useful to temporarily skip
+# the slackware blacklist. You can also override it from command line:
# 'USEBL=0 slackpkg upgrade-all'
USEBL=1
# If two or more repositories contains some same packages, you can specify
# from which repository you prefer to search it.
# The syntax is "<repository_name>:<package_name>"
-# Accepts regular expressions. To give order to an entire repository use "<repository_name>:.*"
+# Accepts regular expressions. To give priority to an entire repository use "<repository_name>:.*"
# Examples:
#PKGS_PRIORITY=( restricted:vlc )
@@ -25,13 +25,13 @@ USEBL=1
#PKGS_PRIORITY=( multilib:.* )
#
-# List repository you want to use (defined below)
+# List repositories you want to use (defined below)
# remember to launch 'slackpkg update' if you modify that row.
REPOPLUS=( slackpkgplus restricted alienbob slacky )
# Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS)
-# Note: only multilib,alienbob,restricted,slacky repositories does supports GPG. If you add other
+# Note: only multilib,alienbob,restricted,slacky repositories support GPG. If you add others
# you may need to disable gpg check in slackpkg.conf
# Slackware 14.1 - x86_64
@@ -40,7 +40,7 @@ MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14
MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.1/x86_64/
MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.1/
-# use this to keep updated the slackpkg+ package
+# use this to keep the slackpkg+ package updated
MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/
# Slackware current - x86_64
Something went wrong with that request. Please try again.