DistRen Changeset - 8e6d4ae5152b · protofusion repositories

Changeset - 8e6d4ae5152b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-10-10 17:41:21

Converted updater to use datadir rather than SYSCONFDIR

2 files changed with 17 insertions and 8 deletions:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ if(argc>1 && (strcmp("-c", argv[1]) == 0 @@
     username = argv[2];
     email = argv[3];
     if(!strchr(email, '@'))
+      {
         fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
+        fprintf(stderr, "I want to see an '@' in your email address!\n\"%s\" may be good enough for you, but I need more!\n", email);
         return 235;
+      }
     if( register_user(username, email) == 1)
+      {
         // register_user generates a key, too */
         curlpost(SYSCONFDIR "/distren.id_rsa","http://protofusion.org/distren/keys");
@@ @@ -89,13 +89,13 @@ cfg_opt_t myopts[] = { @@
 struct options_common *commonopts;
 username = NULL;
 options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
 /* End option getter */
 software_updatecheck(); // Should be run every day-ish, if the slave is constantly running.
+software_updatecheck(datadir); // Should be run every day-ish, if the slave is constantly running.
 /* Notifies the user if there is no username in the conf file */
 if(username == NULL || strcmp(username, "!username") == 0 ){
   fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+}
 else if( username != NULL || strcmp(username,"!username") != 0 ){

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -62,47 +62,56 @@ xmlNodePtr xml_quickxpath(xmlXPathContex @@
   xmlXPathFreeObject(xmlxpathobjptr);
   return toreturn;
+}
 /** Ensures that rendering engines on the computer are up-to-date */
 int software_updatecheck(){
   curlget("http://protofusion.org/srv/version.info", SYSCONFDIR "/serverEngineVersion.info");
 int software_updatecheck(char *datadir){
   char *pathtoserverVersion;
   _distren_asprintf(&pathtoserverVersion, "%s/serverEngineVersion.info",datadir);
   char *engineDownloadPath;
   _distren_asprintf(&engineDownloadPath, "%s/engines/blender.tgz",datadir);
   char *pathtolocalVersion;
   _distren_asprintf(&pathtolocalVersion, "%s/envines/blender/version.info",datadir);
   curlget("http://protofusion.org/srv/version.info",  pathtoserverVersion);
   struct stat buffer;
   char serverVersion[5]; // Version numbers are nice and short
   char localVersion[5]; // Version numbers are nice and short
   // Read server version
+  {
     FILE * serverVersionFile;
-    serverVersionFile = fopen(SYSCONFDIR "/serverEngineVersion.info","r");
+    serverVersionFile = fopen(pathtoserverVersion, "r");
     fscanf(serverVersionFile, "%s",serverVersion);
     fclose(serverVersionFile);
+  }
   // Read local version
+  {
     FILE * localVersionFile;
-    localVersionFile = fopen(SYSCONFDIR "/engines/blender/version.info","r");
+    localVersionFile = fopen(pathtolocalVersion, "r");
     fscanf(localVersionFile, "%s",localVersion);
     fclose(localVersionFile);
+  }
   // If a rendering engine was never downloaded
   if( stat(SYSCONFDIR "/engines/blender", &buffer) == -1){
     fprintf(stderr,"You don't have the blender engine. Preparing to download...");
-    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", SYSCONFDIR "/engines/blender.tgz"); // Add calls for operating system info
+    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", engineDownloadPath); // Add calls for operating system info
     // untar(SYSCONFDIR "/engines/blender.tgz");
+  }
   // If a rendering engine is out-of-date
   else if( serverVersion != localVersion){
     fprintf(stderr,"You don't have the latest blender engine. Preparing to download...");
-    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", SYSCONFDIR "/engines/blender.tgz"); // Add calls for operating system info
+    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", engineDownloadPath); // Add calls for operating system info
     // untar(SYSCONFDIR "/engines/blender.tgz");
+  }
   return 0;
+}

0 comments (0 inline, 0 general)