File design-center-3.6.0.patch of Package design-center
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-design-center-3.6.0/tools/cf-sketch/cf-dc-api.pl ./tools/cf-sketch/cf-dc-api.pl
--- ../orig-design-center-3.6.0/tools/cf-sketch/cf-dc-api.pl 2014-06-04 17:28:39.000000000 +0200
+++ ./tools/cf-sketch/cf-dc-api.pl 2014-06-25 13:40:14.011840029 +0200
@@ -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/perl-lib");
+use lib map { $_ }
+ ("/usr/share/design-center/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.6.0/tools/cf-sketch/cf-sketch.pl ./tools/cf-sketch/cf-sketch.pl
--- ../orig-design-center-3.6.0/tools/cf-sketch/cf-sketch.pl 2014-06-04 17:28:39.000000000 +0200
+++ ./tools/cf-sketch/cf-sketch.pl 2014-06-25 13:41:06.070039943 +0200
@@ -22,12 +22,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/perl-lib");
+use lib map { $_ }
+ ("/usr/share/design-center/cf-sketch");
use warnings;
use strict;
@@ -59,7 +55,7 @@
ignore => 1,
activated => 'any',
veryverbose => 0,
- installsource => Util::local_cfsketches_source(File::Spec->curdir()) || 'https://raw.githubusercontent.com/cfengine/design-center/master/sketches/cfsketches.json',
+ installsource => Util::local_cfsketches_source(File::Spec->curdir()) || '/usr/share/design-center/sketches/cfsketches.json',
# These are hardcoded above, we put them here for convenience
version => $VERSION,
date => $DATE,
@@ -306,8 +302,7 @@
$Term::ANSIColor::AUTORESET = 1;
# Determine where to load command modules from
- (-d ($options{'cmddir'}="$FindBin::Bin/../lib/cf-sketch/perl-lib/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
@@ -331,7 +326,7 @@
my $request_fill = shift @_;
my $mydir = dirname($0);
- my $api_bin = "$mydir/cf-dc-api.pl";
+ my $api_bin = "/usr/share/design-center/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 );