aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--FAQ8
-rw-r--r--Makefile1
-rw-r--r--README2
-rw-r--r--src/action.c14
-rw-r--r--src/package.c4
5 files changed, 15 insertions, 14 deletions
diff --git a/FAQ b/FAQ
index a8e3054..683c29a 100644
--- a/FAQ
+++ b/FAQ
@@ -51,9 +51,9 @@ Frequenty Asked Questions:
To scratch and itch of mine, which also scratched an itch of a friend. I
created it originally without looking for an existing solution. I now
understand Slackware already has existing utilities that provide similar
- functionality. I believe slapt-get to be superior because of it's speed and
+ functionality. I believe slapt-get to be superior because of its speed and
simplicity. I do not believe slapt-get takes away anything from these
- existing tools, slapt-get can stand on it's own merits. In the end, choice
+ existing tools, slapt-get can stand on its own merits. In the end, choice
is great for the end users (just as in the desktop enviroment category).
Regardless, I do not aim for inclusion within Slackware. I only want to make
this availabe in hopes that others will find it useful.
@@ -243,7 +243,7 @@ Frequenty Asked Questions:
13. How can I install every available package?
- Even though it's not built in, it's simple since slapt-get is easy to script
+ Even though it is not built in, it is simple since slapt-get is easy to script
with. Here is a shell command to install every package that is available
but not currently installed:
@@ -651,7 +651,7 @@ Frequenty Asked Questions:
# give usage if no arguments
if [ -z "$1" ]; then echo "Usage: $0 [--update|packages]"; exit; fi
- # get package cache data if it's not already there, or we want it
+ # get package cache data if it is not already there, or we want it
cd ${WORKINGDIR}
if [ "$1" == "--update" ]; then shift; get_pkg_cache_data; fi
if [ ! -f ${PKGLINES} ]; then get_pkg_cache_data; fi
diff --git a/Makefile b/Makefile
index efb5c8c..1262cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ dopkg:
-@mkdir -p pkg$(LOCALESDIR)/pl/LC_MESSAGES; msgfmt -o pkg$(LOCALESDIR)/pl/LC_MESSAGES/slapt-get.mo po/pl.po
-@mkdir -p pkg$(LOCALESDIR)/pt_BR/LC_MESSAGES; msgfmt -o pkg$(LOCALESDIR)/pt_BR/LC_MESSAGES/slapt-get.mo po/pt_BR.po
-@cp $(PROGRAM_NAME) ./pkg/sbin/
+ -@chown root:bin ./pkg/sbin/$(PROGRAM_NAME)
-@strip ./pkg/sbin/$(PROGRAM_NAME)
-@cp example.slapt-getrc ./pkg/etc/slapt-getrc.new
-@mkdir -p ./pkg/usr/doc/$(PROGRAM_NAME)-$(VERSION)/
diff --git a/README b/README
index 3385d84..ab85a48 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ Table of Contents:
slapt-get tries to emulate Debian's apt-get as closely as possible.
* uses native Slackware tools (installpkg, upgradepkg, and removepkg)
- * supports multiple package sources (including linuxpackage.net)
+ * supports multiple package sources (including linuxpackages.net)
* cache data concerning packages and updates from package sources
* supports sources from ftp, ftps, http, https, file:/// and more (libcurl)
* resumes broken downloads and will verify package integrity with MD5
diff --git a/src/action.c b/src/action.c
index c31048c..efb9266 100644
--- a/src/action.c
+++ b/src/action.c
@@ -110,12 +110,12 @@ void pkg_action_install(const rc_config *global_config,const pkg_action_args_t *
installed_pkg = get_newest_pkg(installed_pkgs,action_args->pkgs[i]);
}
- /* if it's not already installed, install it */
+ /* if it is not already installed, install it */
if( installed_pkg == NULL ){
if( add_deps_to_trans(global_config,&tran,avail_pkgs,installed_pkgs,pkg) == 0 ){
/* this way we install the most up to date pkg */
- /* make sure it's not already present from a dep check */
+ /* make sure it is not already present from a dep check */
if( search_transaction(&tran,pkg) == 0 ){
if ( is_conflicted(global_config,&tran,avail_pkgs,installed_pkgs,pkg) == 0 )
@@ -126,14 +126,14 @@ void pkg_action_install(const rc_config *global_config,const pkg_action_args_t *
}else{ /* else we upgrade or reinstall */
- /* it's already installed, attempt an upgrade */
+ /* it is already installed, attempt an upgrade */
if(
((cmp_pkg_versions(installed_pkg->version,pkg->version)) < 0)
|| (global_config->re_install == 1)
){
if( add_deps_to_trans(global_config,&tran,avail_pkgs,installed_pkgs,pkg) == 0 ){
- /* make sure it's not already present from a dep check */
+ /* make sure it is not already present from a dep check */
if( search_transaction(&tran,pkg) == 0 ){
if ( is_conflicted(global_config,&tran,avail_pkgs,installed_pkgs,pkg) == 0 )
@@ -433,7 +433,7 @@ void pkg_action_upgrade_all(const rc_config *global_config){
){
if( add_deps_to_trans(global_config,&tran,avail_pkgs,installed_pkgs,update_pkg) == 0 ){
- /* add if it's not already present in trans */
+ /* add if it is not already present in trans */
if( search_transaction(&tran,update_pkg) == 0 ){
if( is_excluded(global_config,update_pkg) == 1 ){
add_exclude_to_transaction(&tran,update_pkg);
@@ -472,7 +472,7 @@ void pkg_action_upgrade_all(const rc_config *global_config){
}else{
if( add_deps_to_trans(global_config,&tran,avail_pkgs,installed_pkgs,matches->pkgs[i]) == 0 ){
- /* add if it's not already present in trans */
+ /* add if it is not already present in trans */
if( search_transaction(&tran,matches->pkgs[i]) == 0 ){
if ( is_conflicted(global_config,&tran,avail_pkgs,installed_pkgs,matches->pkgs[i]) == 0 )
@@ -516,7 +516,7 @@ int add_deps_to_trans(const rc_config *global_config, transaction *tran, struct
/* loop through the deps */
for(c = 0; c < deps->pkg_count;c++){
- /* only check if it's not already present in trans */
+ /* only check if it is not already present in trans */
if( search_transaction(tran,deps->pkgs[c]) == 0 ){
pkg_info_t *dep_installed;
diff --git a/src/package.c b/src/package.c
index 55b3c9c..255b0e3 100644
--- a/src/package.c
+++ b/src/package.c
@@ -573,7 +573,7 @@ pkg_info_t *get_exact_pkg(struct pkg_list *list,const char *name,const char *ver
/*
* this function is here for historic reasons
* and in case it may ever need to be revived
- * from it's cold sleep of death.
+ * from its cold sleep of death.
*/
struct pkg_list *parse_file_list(FILE *fh){
size_t getline_len;
@@ -840,7 +840,7 @@ void get_md5sum(pkg_info_t *pkg,FILE *checksum_file){
while( (getline_read = getline(&getline_buffer,&getline_len,checksum_file) ) != EOF ){
- /* ignore if it's not our package */
+ /* ignore if it is not our package */
if( strstr(getline_buffer,pkg->name) == NULL) continue;
if( strstr(getline_buffer,pkg->version) == NULL) continue;
if( strstr(getline_buffer,".tgz") == NULL) continue;