File design-center-3.5.2.patch of Package design-center

Overview Repositories Revisions Requests Users Attributes Meta

File design-center-3.5.2.patch of Package design-center (Revision d8d3128d53664c20198fa71261fac28d)

Currently displaying revision d8d3128d53664c20198fa71261fac28d , Show latest

diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-design-center-3.5.2/tools/cf-sketch/cf-dc-api.pl ./tools/cf-sketch/cf-dc-api.pl
--- ../orig-design-center-3.5.2/tools/cf-sketch/cf-dc-api.pl	2013-08-14 00:01:54.000000000 +0200
+++ ./tools/cf-sketch/cf-dc-api.pl	2013-10-29 11:59:12.301569052 +0100
@@ -14,12 +14,8 @@
 
 use File::Basename;
 use FindBin;
-use lib map { $_,
-               "$_/File-Which-1.09/lib",
-               "$_/File-Path-2.09",
-               "$_/JSON-2.53/lib",
-               "$_/Mo-0.31/lib" }
- ("$FindBin::Bin/perl-lib", "$FindBin::Bin/../lib/cf-sketch");
+use lib map { $_ }
+ ("/usr/share/cf-sketch");
 
 use warnings;
 use strict;
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-design-center-3.5.2/tools/cf-sketch/cf-sketch.pl ./tools/cf-sketch/cf-sketch.pl
--- ../orig-design-center-3.5.2/tools/cf-sketch/cf-sketch.pl	2013-08-14 00:01:54.000000000 +0200
+++ ./tools/cf-sketch/cf-sketch.pl	2013-10-29 12:37:49.165977665 +0100
@@ -31,12 +31,8 @@
 
 use File::Basename;
 use FindBin;
-use lib map { $_,
-               "$_/File-Path-2.09",
-               "$_/File-Which-1.09/lib",
-               "$_/JSON-2.53/lib",
-               "$_/Mo-0.31/lib" }
- ("$FindBin::Bin/perl-lib", "$FindBin::Bin/../lib/cf-sketch");
+use lib map { $_ }
+ ("/usr/share/cf-sketch");
 
 use warnings;
 use strict;
@@ -52,7 +48,7 @@
 
 # Find constdata.conf
 my $constdata=undef;
-foreach ($FindBin::Bin, "$FindBin::Bin/perl-lib", "$FindBin::Bin/../lib/cf-sketch", "/var/cfengine/constdata.conf") {
+foreach ("/etc/cf-sketch/constdata.conf") {
   if (-f "$_/constdata.conf") {
     $constdata = "$_/constdata.conf";
   }
@@ -80,7 +76,7 @@
                runfile => "$inputs_root/cf-sketch-runfile.cf",
                vardata => undef,
                standalonerunfile => "$inputs_root/cf-sketch-runfile-standalone.cf",
-               installsource => Util::local_cfsketches_source(File::Spec->curdir()) || 'https://raw.github.com/cfengine/design-center/master/sketches/cfsketches.json',
+               installsource => Util::local_cfsketches_source(File::Spec->curdir()) || '/usr/share/design-center/sketches/cfsketches.json',
                constdata => $constdata,
                # These are hardcoded above, we put them here for convenience
                version => $VERSION,
@@ -303,8 +299,7 @@
     $Term::ANSIColor::AUTORESET = 1;
 
     # Determine where to load command modules from
-    (-d ($options{'cmddir'}="$FindBin::Bin/../lib/cf-sketch/Parser/Commands")) ||
-    (-d ($options{'cmddir'}="$FindBin::Bin/perl-lib/Parser/Commands")) ||
+    (-d ($options{'cmddir'}="/usr/share/design-center/cf-sketch/Parser/Commands")) ||
     ($options{'cmddir'}=undef);
 
     # Load commands and do other parser initialization
@@ -328,7 +323,7 @@
     my $request_fill = shift @_;
 
     my $mydir = dirname($0);
-    my $api_bin = "$mydir/cf-dc-api.pl";
+    my $api_bin = "/usr/share/cf-sketch/cf-dc-api.pl";
 
     my ($fh_config, $filename_config) = tempfile( "./cf-dc-api-run-XXXX", TMPDIR => 1 );
     my ($fh_data, $filename_data) = tempfile( "./cf-dc-api-run-XXXX", TMPDIR => 1 );

Places

File design-center-3.5.2.patch of Package design-center (Revision d8d3128d53664c20198fa71261fac28d)

Places