aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2020-03-08 09:31:22 +0100
committerLibravatar vantezzen <hello@vantezzen.io>2020-03-08 09:31:22 +0100
commitb8bc9d91acf722dee1f846e29c207cea88385ecf (patch)
tree746b2a2e84534984b647ca884fe134e0c3e71f26
parentFix filename missing in log output (diff)
downloadferdium-recipes-b8bc9d91acf722dee1f846e29c207cea88385ecf.tar.gz
ferdium-recipes-b8bc9d91acf722dee1f846e29c207cea88385ecf.tar.zst
ferdium-recipes-b8bc9d91acf722dee1f846e29c207cea88385ecf.zip
Ignore DS_Store files in scripts
-rw-r--r--scripts/package.js6
-rw-r--r--scripts/verify-all.js8
-rw-r--r--scripts/verify.js6
3 files changed, 20 insertions, 0 deletions
diff --git a/scripts/package.js b/scripts/package.js
index 2be3a69..fa7486c 100644
--- a/scripts/package.js
+++ b/scripts/package.js
@@ -16,6 +16,12 @@ const compress = (src, dest) => new Promise((resolve, reject) => {
16 targz.compress({ 16 targz.compress({
17 src, 17 src,
18 dest, 18 dest,
19 tar: {
20 // Don't package .DS_Store files
21 ignore: function(name) {
22 return path.basename(name) === '.DS_Store'
23 }
24 },
19 }, (err) => { 25 }, (err) => {
20 if (err) { 26 if (err) {
21 reject(err); 27 reject(err);
diff --git a/scripts/verify-all.js b/scripts/verify-all.js
index cbae904..cb138f3 100644
--- a/scripts/verify-all.js
+++ b/scripts/verify-all.js
@@ -11,6 +11,12 @@ const decompress = (src, dest) => new Promise((resolve, reject) => {
11 targz.decompress({ 11 targz.decompress({
12 src, 12 src,
13 dest, 13 dest,
14 tar: {
15 // Don't unpackage .DS_Store files
16 ignore: function(name) {
17 return path.basename(name) === '.DS_Store'
18 }
19 },
14 }, (err) => { 20 }, (err) => {
15 if (err) { 21 if (err) {
16 reject(err); 22 reject(err);
@@ -54,6 +60,8 @@ const decompress = (src, dest) => new Promise((resolve, reject) => {
54 // Compare directories 60 // Compare directories
55 const compare = dircompare.compareSync(uncompressedRecipe, tempUncompressed, { 61 const compare = dircompare.compareSync(uncompressedRecipe, tempUncompressed, {
56 compareContent: true, 62 compareContent: true,
63 // Don't fail because of DS_Store files
64 excludeFilter: '.DS_Store'
57 }); 65 });
58 66
59 if (compare.same) { 67 if (compare.same) {
diff --git a/scripts/verify.js b/scripts/verify.js
index 59dbe61..4075cad 100644
--- a/scripts/verify.js
+++ b/scripts/verify.js
@@ -11,6 +11,12 @@ const decompress = (src, dest) => new Promise((resolve, reject) => {
11 targz.decompress({ 11 targz.decompress({
12 src, 12 src,
13 dest, 13 dest,
14 tar: {
15 // Don't unpackage .DS_Store files
16 ignore: function(name) {
17 return path.basename(name) === '.DS_Store'
18 }
19 },
14 }, (err) => { 20 }, (err) => {
15 if (err) { 21 if (err) {
16 reject(err); 22 reject(err);