aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--INSTALL2
-rw-r--r--Makefile8
-rw-r--r--README8
-rw-r--r--TODO4
-rw-r--r--doc/slapt-get.810
-rw-r--r--example.slapt-getrc2
-rw-r--r--slack-desc22
-rw-r--r--src/action.c26
-rw-r--r--src/action.h20
-rw-r--r--src/main.c24
-rw-r--r--src/main.h6
12 files changed, 70 insertions, 67 deletions
diff --git a/ChangeLog b/ChangeLog
index 99a6e54..12e85ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.9.2 Sep 18, 2003
+ * renamed to slapt-get
+
0.9 Sep 17, 2003
* --re-install is now --reinstall
* code updates
@@ -13,7 +16,7 @@
* --upgrade now prompts before upgrading the package
* --no-prompt option for overriding --upgrade prompt
* --re-install option to install even if already installed
- * added EXCLUDE option in jaospkgrc (to exclude pkgs)
+ * added EXCLUDE option in slapt-getrc (to exclude pkgs)
* --ignore-excludes for --upgrade
* is_excluded() returns false if EXCLUDE= not defined
* added slackpkg make target
diff --git a/INSTALL b/INSTALL
index 7af3b17..4be9bb1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,7 +3,7 @@ To install:
$ make
$ make install
- Edit /etc/jaospkgrc (see README for details)
+ Edit /etc/slapt-getrc (see README for details)
To uninstall:
diff --git a/Makefile b/Makefile
index 19355c5..01c1a0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-PROGNAME=jaospkg
+PROGNAME=slapt-get
VERSION=0.8
CC=gcc
CURLFLAGS=`curl-config --libs`
CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic -Iinclude -g
OBJS=src/configuration.o src/package.o src/curl.o src/action.o src/main.o
-RCDEST=/etc/jaospkgrc
-RCSOURCE=example.jaospkgrc
+RCDEST=/etc/slapt-getrc
+RCSOURCE=example.slapt-getrc
SBINDIR=/sbin/
default: all
@@ -38,7 +38,7 @@ slackpkg: $(PROGNAME)
-@mkdir -p slackpkg/install
-@mkdir -p slackpkg/usr/man/man8
-@cp $(PROGNAME) ./slackpkg/sbin/
- -@cp example.jaospkgrc ./slackpkg/etc/jaospkgrc
+ -@cp example.slapt-getrc ./slackpkg/etc/slapt-getrc
-@mkdir -p ./slackpkg/usr/doc/$(PROGNAME)-$(VERSION)/
-@cp COPYING Changelog INSTALL README TODO ./slackpkg/usr/doc/$(PROGNAME)-$(VERSION)/
-@cp slack-desc slackpkg/install/
diff --git a/README b/README
index 8aa84e4..6b7bbed 100644
--- a/README
+++ b/README
@@ -20,14 +20,14 @@ Table of Contents:
1. Features
2. Requirements
3. Installation
- 4. jaospkgrc
+ 4. slapt-getrc
5. Troubleshooting
1. Features
- Jaospkg tries to emulate Debian's apt-get as closely as possible.
+ slapt-get tries to emulate Debian's apt-get as closely as possible.
* cache package data and update data from mirror site
* show packages that are available (from cached data)
@@ -54,9 +54,9 @@ Table of Contents:
- 4. jaospkgrc
+ 4. slapt-getrc
- The jaospkgrc file consists currently of the following keys:
+ The slapt-getrc file consists currently of the following keys:
MIRROR
WORKINGDIR
diff --git a/TODO b/TODO
index f324de2..f020733 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,9 @@
-JaosPKG is pretty feature complete. At the moment, bug fixes are the most important.
+slapt-get is pretty feature complete. At the moment, bug fixes are the most important.
Future enhancements, fixes, or features:
* find cause of segfault in packages.c (when calloc's turned to malloc)
* file check before downloading pkg (don't download twice, incorp md5sum checking)
* source pkg handling
- * jaospkg_upgrade_all() calls jaospkg_upgrade() just like jaospkg_install() does
+ * pkg_action_upgrade_all() calls pkg_action_upgrade() just like pkg_action_install() does
diff --git a/doc/slapt-get.8 b/doc/slapt-get.8
index ea02a9d..f487baf 100644
--- a/doc/slapt-get.8
+++ b/doc/slapt-get.8
@@ -7,11 +7,11 @@
.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
.el .TP "\\$1"
..
-.TH JAOSPKG 8
+.TH slapt-get 8
.SH NAME
-jaospkg \- frontend to pkgtools
+slapt-get \- frontend to pkgtools
.SH SYNOPSIS
-.B jaospkg
+.B slapt-get
[
.B option(s)
]
@@ -71,13 +71,13 @@ jaospkg \- frontend to pkgtools
.B --version
]
.SH DESCRIPTION
-.B jaospkg
+.B slapt-get
is an APT like system for Slackware package management. It
allows one to search for packages, install them, and upgrade the
installed packages all with a few simple commands. Additional
features include listing all available packages, listing all
installed packages, and removing installed packages.
-.B jaospkg
+.B slapt-get
tries to emulate Debian's apt-get as closely as possible.
.SH OPTIONS
.TP
diff --git a/example.slapt-getrc b/example.slapt-getrc
index 0b1faa7..c6ed2c4 100644
--- a/example.slapt-getrc
+++ b/example.slapt-getrc
@@ -1,6 +1,6 @@
# base mirror url to directory with PACKAGES.TXT
MIRROR=http://sunsite.cnlab-switch.ch/ftp/mirror/slackware/slackware-9.0/
-WORKINGDIR=/var/jaospkg
+WORKINGDIR=/var/slapt-get
EXCLUDE=kernel-ide,kernel-source,kernel-headers,kernel-modules
# MIRROR=ftp://mirror.aarnet.edu.au/pub/slackware/slackware-9.0
diff --git a/slack-desc b/slack-desc
index d8dfc9f..3a98a90 100644
--- a/slack-desc
+++ b/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-jaospkg: jaospkg (APT like system for Slackware)
-jaospkg:
-jaospkg: jaospkg is an APT like system for Slackware package management. It
-jaospkg: allows one to search for packages, install them, and upgrade the
-jaospkg: installed packages all with a few simple commands. Additional
-jaospkg: features include listing all available packages, listing all
-jaospkg: installed packages, and removing installed packages.
-jaospkg:
-jaospkg:
-jaospkg:
-jaospkg:
+slapt-get: slapt-get (APT like system for Slackware)
+slapt-get:
+slapt-get: slapt-get is an APT like system for Slackware package management. It
+slapt-get: allows one to search for packages, install them, and upgrade the
+slapt-get: installed packages all with a few simple commands. Additional
+slapt-get: features include listing all available packages, listing all
+slapt-get: installed packages, and removing installed packages.
+slapt-get:
+slapt-get:
+slapt-get:
+slapt-get:
diff --git a/src/action.c b/src/action.c
index e4b07da..cf9139f 100644
--- a/src/action.c
+++ b/src/action.c
@@ -19,12 +19,12 @@
#include <main.h>
/* clean out local cache */
-void jaospkg_clean(const rc_config *global_config){
+void pkg_action_clean(const rc_config *global_config){
clean_pkg_dir(global_config->working_dir);
}
/* install pkg */
-void jaospkg_install(const rc_config *global_config,const char *pkg_name){
+void pkg_action_install(const rc_config *global_config,const char *pkg_name){
pkg_info_t *installed_pkg;
pkg_info_t *update_pkg;
pkg_info_t *pkg;
@@ -46,7 +46,7 @@ void jaospkg_install(const rc_config *global_config,const char *pkg_name){
&& (global_config->re_install != 1 ) ){
/* it's already installed, attempt an upgrade */
- jaospkg_upgrade(global_config,installed_pkg);
+ pkg_action_upgrade(global_config,installed_pkg);
}else{
@@ -72,7 +72,7 @@ void jaospkg_install(const rc_config *global_config,const char *pkg_name){
}
/* list pkgs */
-void jaospkg_list(void){
+void pkg_action_list(void){
struct pkg_list *pkgs = NULL;
int iterator;
@@ -89,7 +89,7 @@ void jaospkg_list(void){
}
/* list installed pkgs */
-void jaospkg_list_installed(void){
+void pkg_action_list_installed(void){
int iterator;
struct pkg_list *installed_pkgs = NULL;
@@ -106,7 +106,7 @@ void jaospkg_list_installed(void){
}
/* remove/uninstall pkg */
-void jaospkg_remove(const char *pkg_name){
+void pkg_action_remove(const char *pkg_name){
pkg_info_t *pkg;
struct pkg_list *installed;
@@ -124,7 +124,7 @@ void jaospkg_remove(const char *pkg_name){
}
/* search for a pkg (support extended POSIX regex) */
-void jaospkg_search(const char *pattern){
+void pkg_action_search(const char *pattern){
struct pkg_list *pkgs = NULL;
int iterator,regexec_return;
regex_t regex;
@@ -161,7 +161,7 @@ void jaospkg_search(const char *pattern){
}/* end search */
/* show the details for a specific package */
-void jaospkg_show(const char *pkg_name){
+void pkg_action_show(const char *pkg_name){
pkg_info_t *pkg;
struct pkg_list *available_pkgs;
@@ -183,7 +183,7 @@ void jaospkg_show(const char *pkg_name){
}
/* update package data from mirror url */
-void jaospkg_update(const rc_config *global_config){
+void pkg_action_update(const rc_config *global_config){
FILE *pkg_list_fh;
FILE *patches_list_fh;
@@ -201,8 +201,8 @@ void jaospkg_update(const rc_config *global_config){
}
/* upgrade pkg */
-/* flesh me out so that jaospkg_upgrade_all() calls me */
-void jaospkg_upgrade(const rc_config *global_config,pkg_info_t *installed_pkg){
+/* flesh me out so that pkg_action_upgrade_all() calls me */
+void pkg_action_upgrade(const rc_config *global_config,pkg_info_t *installed_pkg){
pkg_info_t *update_pkg;
struct pkg_list *update_pkgs;
int cmp_result;
@@ -234,8 +234,8 @@ void jaospkg_upgrade(const rc_config *global_config,pkg_info_t *installed_pkg){
}
/* upgrade all installed pkgs with available updates */
-/* use jaospkg_upgrade() soon, pass in pkg_list(s) */
-void jaospkg_upgrade_all(const rc_config *global_config){
+/* use pkg_action_upgrade() soon, pass in pkg_list(s) */
+void pkg_action_upgrade_all(const rc_config *global_config){
int iterator;
struct pkg_list *installed_pkgs;
struct pkg_list *update_pkgs;
diff --git a/src/action.h b/src/action.h
index 85559b1..3ce5ba6 100644
--- a/src/action.h
+++ b/src/action.h
@@ -16,14 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* FUNCTION DEFINITIONS */
-void jaospkg_clean(const rc_config *);
-void jaospkg_install(const rc_config *,const char *);
-void jaospkg_list(void);
-void jaospkg_list_installed(void);
-void jaospkg_remove(const char *);
-void jaospkg_search(const char *);
-void jaospkg_show(const char *);
-void jaospkg_upgrade(const rc_config *,pkg_info_t *);
-void jaospkg_upgrade_all(const rc_config *);
-void jaospkg_update(const rc_config *);
+void pkg_action_clean(const rc_config *);
+void pkg_action_install(const rc_config *,const char *);
+void pkg_action_list(void);
+void pkg_action_list_installed(void);
+void pkg_action_remove(const char *);
+void pkg_action_search(const char *);
+void pkg_action_show(const char *);
+void pkg_action_upgrade(const rc_config *,pkg_info_t *);
+void pkg_action_upgrade_all(const rc_config *);
+void pkg_action_update(const rc_config *);
diff --git a/src/main.c b/src/main.c
index 6b28809..d02c0fc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,13 +59,13 @@ int main( int argc, char *argv[] ){
while( ( c = getopt_long_only(argc,argv,"",long_options,&option_index ) ) != EOF ){
switch(c){
case 'u': /* update */
- jaospkg_update(global_config);
+ pkg_action_update(global_config);
break;
case 'i': /* install */
if( optarg != NULL ){
- jaospkg_install( global_config, optarg );
+ pkg_action_install( global_config, optarg );
for(;optind < argc;optind++){
- jaospkg_install( global_config, argv[optind] );
+ pkg_action_install( global_config, argv[optind] );
}
}else{
usage();
@@ -73,9 +73,9 @@ int main( int argc, char *argv[] ){
break;
case 'r': /* remove */
if( optarg != NULL ){
- jaospkg_remove( optarg );
+ pkg_action_remove( optarg );
for(;optind < argc;optind++){
- jaospkg_remove( argv[optind] );
+ pkg_action_remove( argv[optind] );
}
}else{
usage();
@@ -83,29 +83,29 @@ int main( int argc, char *argv[] ){
break;
case 's': /* show */
if( optarg != NULL ){
- jaospkg_show( optarg );
+ pkg_action_show( optarg );
}else{
usage();
}
break;
case 'e': /* search */
if( optarg != NULL ){
- jaospkg_search( optarg );
+ pkg_action_search( optarg );
}else{
usage();
}
break;
case 't': /* list */
- jaospkg_list();
+ pkg_action_list();
break;
case 'd': /* installed */
- jaospkg_list_installed();
+ pkg_action_list_installed();
break;
case 'c': /* clean */
- jaospkg_clean(global_config);
+ pkg_action_clean(global_config);
break;
case 'g': /* upgrade */
- jaospkg_upgrade_all(global_config);
+ pkg_action_upgrade_all(global_config);
break;
case 'o': /* download only flag */
global_config->download_only = 1;
@@ -143,7 +143,7 @@ void usage(){
printf("%s - Jason Woodward <woodwardj at jaos dot org>\n",PROGRAM_NAME);
printf("A crude port of the Debian APT system to Slackware\n");
printf("Usage:\n");
- printf("jaospkg [option(s)] [target]\n");
+ printf("%s [option(s)] [target]\n",PROGRAM_NAME);
printf("\n");
printf("Targets:\n");
printf(" --update - retrieves pkg data from MIRROR\n");
diff --git a/src/main.h b/src/main.h
index cc0f4df..2b277ad 100644
--- a/src/main.h
+++ b/src/main.h
@@ -50,14 +50,14 @@ void version_info(void);
/* */
#define DEBUG 0
-#define PROGRAM_NAME "jaospkg"
-#define VERSION "0.8"
+#define PROGRAM_NAME "slapt-get"
+#define VERSION "0.9"
#define PKG_LIST "PACKAGES.TXT"
#define PKG_LIST_L "package_data_list"
#define PATCHES_LIST "FILE_LIST"
#define PATCHES_LIST_L "patches_list"
#define PATCHDIR "patches/"
-#define RC_LOCATION "/etc/jaospkgrc"
+#define RC_LOCATION "/etc/slapt-getrc"
#define REMOVE_CMD "/sbin/removepkg "
#define INSTALL_CMD "/sbin/installpkg "
#define UPGRADE_CMD "/sbin/upgradepkg "