DistRen Changeset - f70cfbc2aa25 · protofusion repositories

Changeset - f70cfbc2aa25

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-07-25 01:24:43

Binary name changes for fprintf's, minor changes

2 files changed with 6 insertions and 6 deletions:

etc/distrenslave.conf

src/server/slave.c

0 comments (0 inline, 0 general)

etc/distrenslave.conf

➞

Show inline comments

 slave
+{
   username = "";
   key = "";
   username = "!username";
   key = "!key";
+}
 include("distrencommon.conf")

src/server/slave.c

➞

Show inline comments

@@ @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) @@
 		if(argc != 4)
+		{
-			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'slave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!'", argc - 1);
+			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!'", argc - 1);
 			return 234;
+		}
@@ @@ -60,8 +60,8 @@ int main(int argc, char *argv[]) @@
+		}
 		*key = register_user(username, email); // register_user returns a uniquely random url to a key
 		get("http://protofusion.org/distren/key/%s",key);
 		fprintf(stderr, "you registered, hopefully successfully. Invoke distrend with no args now.");
 		exec('echo %s >> distrend.conf',key);
 		fprintf(stderr, "You registered, hopefully successfully. Invoke distrenslave with no args now.");
 		exec('echo %s >> distrenslave.conf',key);
+	}
 /* End arg parser */
@@ @@ -81,7 +81,7 @@ struct options_common *commonopts @@
 options_init(argc,argv,&my_cfg, &myopts, "slave", &commonopts);
 	if(key == NULL || username == NULL){
-		fprintf(stderr,"You didn't register! Please register or add your username to distrenslave.conf");
+		fprintf(stderr,"You didn't register! \n Please register (Invoke 'distrenslave -c <username> <emailaddr> to register) \nor add your username to distrenslave.conf");
+	}
 	else if(key != NULL || username != NULL){
 		loginuser(username); // Logs in user to the server

0 comments (0 inline, 0 general)