Use sprintf from node_modules.

cloudkick · Mar 30, 2011 · fc84ebb · fc84ebb
1 parent 498ffdf
commit fc84ebb
Show file tree

Hide file tree

Showing 41 changed files with 40 additions and 138 deletions.
diff --git a/lib/cast-agent/entry.js b/lib/cast-agent/entry.js
@@ -16,7 +16,7 @@
  */
 
 var sys = require('sys');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var log = require('util/log');
 var version = require('util/version');
 var ps = require('util/pubsub');

diff --git a/lib/cast-client/commands/bundles/create.js b/lib/cast-client/commands/bundles/create.js
@@ -19,7 +19,7 @@ var sys = require('sys');
 var fs = require('fs');
 var path = require('path');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 
 var tarball = require('util/tarball');

diff --git a/lib/cast-client/commands/bundles/list.js b/lib/cast-client/commands/bundles/list.js
@@ -17,7 +17,7 @@
 
 var sys = require('sys');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var terminal = require('util/terminal');
 var http = require('util/http');

diff --git a/lib/cast-client/commands/bundles/validate-manifest.js b/lib/cast-client/commands/bundles/validate-manifest.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var path = require('path');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var manifest = require('manifest/index');
 var manifestConstants = require('manifest/constants');

diff --git a/lib/cast-client/commands/completion.js b/lib/cast-client/commands/completion.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var path = require('path');
 
-var sprintf = require('extern/sprintf');
+var sprintf = require('sprintf');
 
 var misc = require('util/misc');
 

diff --git a/lib/cast-client/commands/info.js b/lib/cast-client/commands/info.js
@@ -15,7 +15,7 @@
  * limitations under the License.
 */
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var terminal = require('util/terminal');
 var version = require('util/version');

diff --git a/lib/cast-client/commands/instances/create.js b/lib/cast-client/commands/instances/create.js
@@ -26,7 +26,7 @@ var dotfiles = require('util/client_dotfiles');
 var manifest = require('manifest');
 var MANIFEST_FILENAME = require('manifest/constants').MANIFEST_FILENAME;
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 
 

diff --git a/lib/cast-client/commands/instances/destroy.js b/lib/cast-client/commands/instances/destroy.js
@@ -23,7 +23,7 @@ var http = require('util/http');
 var misc = require('util/misc');
 var term = require('util/terminal');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 
 var config = {

diff --git a/lib/cast-client/commands/instances/list.js b/lib/cast-client/commands/instances/list.js
@@ -17,7 +17,7 @@
 
 var sys = require('sys');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var http = require('util/http');
 var terminal = require('util/terminal');

diff --git a/lib/cast-client/commands/remotes/add.js b/lib/cast-client/commands/remotes/add.js
@@ -20,7 +20,7 @@ var url = require('url');
 var fs = require('fs');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var Errorf = require('util/misc').Errorf;
 
 var dotfiles = require('util/client_dotfiles');

diff --git a/lib/cast-client/commands/remotes/delete.js b/lib/cast-client/commands/remotes/delete.js
@@ -17,7 +17,7 @@
 
 var sys = require('sys');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 
 var Errorf = require('util/misc').Errorf;

diff --git a/lib/cast-client/commands/remotes/list.js b/lib/cast-client/commands/remotes/list.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var fs = require('fs');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 
 var dotfiles = require('util/client_dotfiles');

diff --git a/lib/cast-client/commands/remotes/set-default.js b/lib/cast-client/commands/remotes/set-default.js
@@ -19,7 +19,7 @@ var fs = require('fs');
 var sys = require('sys');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var Errorf = require('util/misc').Errorf;
 
 var dotfiles = require('util/client_dotfiles');

diff --git a/lib/cast-client/commands/services/list.js b/lib/cast-client/commands/services/list.js
@@ -17,7 +17,7 @@
 
 var sys = require('sys');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var http = require('util/http');
 var terminal = require('util/terminal');

diff --git a/lib/cast-client/commands/services/service_cmd.js b/lib/cast-client/commands/services/service_cmd.js
@@ -20,7 +20,7 @@ var path = require('path');
 
 var http = require('util/http');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 exports.buildCommand = function(mod, action, actionPtense) {
   var actionCapped = action.charAt(0).toUpperCase() + action.slice(1);

diff --git a/lib/cast-client/commands/services/tail.js b/lib/cast-client/commands/services/tail.js
@@ -19,7 +19,7 @@ var sys = require('sys');
 var path = require('path');
 var http = require('util/http');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var config = {
   shortDescription: 'Print log file for a specified service',

diff --git a/lib/deployment/hooks.js b/lib/deployment/hooks.js
@@ -20,7 +20,7 @@ var spawn = require('child_process').spawn;
 var util = require('util');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var dotfiles = require('util/client_dotfiles');
 var log = require('util/log');

diff --git a/lib/deployment/instances.js b/lib/deployment/instances.js
@@ -31,7 +31,7 @@ var fsutil = require('util/fs');
 var flowctrl = require('util/flow_control');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var INSTANCE_NAME_RE = /^[a-zA-Z0-9_\-]+$/;
 

diff --git a/lib/extern/sprintf.js b/lib/extern/sprintf.js
diff --git a/lib/health/checks/http.js b/lib/health/checks/http.js
@@ -19,7 +19,7 @@ var sys = require('sys');
 var http = require('http');
 var url = require('url');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var log = require('util/log');
 
 var Check = require('health').Check;

diff --git a/lib/health/checks/tcp.js b/lib/health/checks/tcp.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var net = require('net');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var log = require('util/log');
 
 var Check = require('health').Check;

diff --git a/lib/manifest/index.js b/lib/manifest/index.js
@@ -19,7 +19,7 @@ var path = require('path');
 var fs = require('fs');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var misc = require('util/misc');
 var ufs = require('util/fs');

diff --git a/lib/manifest/validators.js b/lib/manifest/validators.js
@@ -20,7 +20,7 @@ var path = require('path');
 
 var T = require('extern/strobe-templates/index');
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var misc = require('util/misc');
 var health = require('health');

diff --git a/lib/norris/facts/gnutar.js b/lib/norris/facts/gnutar.js
@@ -18,7 +18,7 @@
 var exec = require('child_process').exec;
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var trim = require('util/misc').trim;
 

diff --git a/lib/security/certgen.js b/lib/security/certgen.js
@@ -18,7 +18,7 @@
 var exec = require('child_process').exec;
 var fs = require('fs');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var log = require('util/log');
 var config = require('util/config');

diff --git a/lib/service_management/runit/index.js b/lib/service_management/runit/index.js
@@ -28,7 +28,7 @@ var misc = require('util/misc');
 var config = require('util/config');
 var fsutil = require('util/fs');
 var flowctrl = require('util/flow_control');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var async = require('extern/async');
 var jspack = require('extern/jspack/jspack').jspack;
 

diff --git a/lib/service_management/runit/templates/base.js b/lib/service_management/runit/templates/base.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var misc = require('util/misc');
 var config = require('util/config');

diff --git a/lib/service_management/runit/templates/nodejs.js b/lib/service_management/runit/templates/nodejs.js
@@ -17,7 +17,7 @@
 
 var path = require('path');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var base = require('./base');
 
 var norris = require('norris');

diff --git a/lib/service_management/runit/templates/shell.js b/lib/service_management/runit/templates/shell.js
@@ -17,7 +17,7 @@
 
 var path = require('path');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var base = require('./base');
 
 /**

diff --git a/lib/services/agent.js b/lib/services/agent.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var net = require('net');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 var WorkerPool = require('extern/node-worker/index').worker_pool.WorkerPool;
 
 var ps = require('util/pubsub');

diff --git a/lib/services/health.js b/lib/services/health.js
@@ -19,7 +19,7 @@ var sys = require('sys');
 var uuid = require('extern/uuid');
 
 var async = require('extern/async');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var ps = require('util/pubsub');
 var log = require('util/log');

diff --git a/lib/services/http.js b/lib/services/http.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var fs = require('fs');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var crypto = require('crypto');
 var ps = require('util/pubsub');

diff --git a/lib/services/index.js b/lib/services/index.js
@@ -16,7 +16,7 @@
  */
 
 var log = require('util/log');
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 /**
  * Base service class

diff --git a/lib/util/command_parser.js b/lib/util/command_parser.js
@@ -18,7 +18,7 @@
 var sys = require('sys');
 var path = require('path');
 
-var sprintf = require('extern/sprintf').sprintf;
+var sprintf = require('sprintf').sprintf;
 
 var log = require('util/log');
 var misc = require('util/misc');