Skip to content

Commit 1c869ac

Browse files
committed
Fix release script
Remove minified files from repository Fix paths for CSS and JS to be correctly minified at release
1 parent c218c8e commit 1c869ac

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

public/lib/deploy_editsubtype.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/lib/plusbutton.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/lib/timeslot.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ function timeslot(jsonstr) {
4646
data[day_index*(24*4) + i] = {"day":day_index+1, "hour": (i/4)+1, "value":val, "dec":dec};
4747
}
4848
};
49-
console.log(data);
5049
var svg = d3.select("#chart").append("svg")
5150
.attr("width", width + margin.left + margin.right)
5251
.attr("height", height + margin.top + margin.bottom)

public/lib/timeslot.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/make_release.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ sed \
9797
-i '' setup.php
9898

9999
echo "Minify stylesheets and javascripts"
100-
find /tmp/glpiinventory/css /tmp/glpiinventory/lib \( -iname "*.css" ! -iname "*.min.css" \) \
100+
find /tmp/glpiinventory/public/css /tmp/glpiinventory/public/lib \( -iname "*.css" ! -iname "*.min.css" \) \
101101
-exec sh -c 'echo "> {}" && "'$INIT_PWD'"/../../node_modules/.bin/csso {} --output $(dirname {})/$(basename {} ".css").min.css' \;
102102

103103
echo "Minify javascripts"
104-
find /tmp/glpiinventory/js /tmp/glpiinventory/lib \( -iname "*.js" ! -iname "*.min.js" \) \
104+
find /tmp/glpiinventory/public/js /tmp/glpiinventory/public/lib \( -iname "*.js" ! -iname "*.min.js" \) \
105105
-exec sh -c 'echo "> {}" && "'$INIT_PWD'"/../../node_modules/.bin/terser {} --mangle --output $(dirname {})/$(basename {} ".js").min.js' \;
106106

107107
echo "Compile locale files"
@@ -111,21 +111,17 @@ echo "Delete various scripts and directories"
111111
\rm -rf .github;
112112
\rm -rf vendor;
113113
\rm -rf tools;
114-
\rm -rf phpunit;
115114
\rm -rf tests;
116115
\rm -rf .gitignore;
117-
\rm -rf .travis.yml;
118-
\rm -rf .coveralls.yml;
119-
\rm -rf phpunit.xml.dist;
116+
\rm -rf .php-cs-fixer.dist.php;
117+
\rm -rf phpstan\*;
118+
\rm -rf phpunit\*;
120119
\rm -rf composer.json;
121120
\rm -rf composer.lock;
122121
\rm -rf .composer.hash;
123-
\rm -rf ISSUE_TEMPLATE.md;
124-
\rm -rf PULL_REQUEST_TEMPLATE.md;
125122
\rm -rf .tx;
126123
\rm -rf glpiinventory.xml;
127-
\rm -rf screenshots;
128-
\find pics/ -type f -name "*.eps" -exec rm -rf {} \;
124+
\find public/pics/ -type f -name "*.eps" -exec rm -rf {} \;
129125

130126
echo "Creating tarball";
131127
cd ..;

0 commit comments

Comments
 (0)