kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Skip from worktree the css/custom.css:

Browse Source 
On the next release the css/custom.css will rename to
css/custom.css.sample

This change run git instructions to detach the file from own local
repository. This instructions are called in untrack-css.sh file from
run-start.sh and npm postinstall step

Reference #1540
This commit is contained in:
Rodrigo Ramírez Norambuena 2019-07-26 01:19:44 -04:00
parent 32521aba6b
commit 2822303138
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -15,6 +15,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Updated ### Updated
- Updatenotification module: Display update notification for a limited (configurable) time. - Updatenotification module: Display update notification for a limited (configurable) time.
- The css/custom.css will be rename after the next release. We've add into `run-start.sh` a instruction by GIT to ignore with `--skip-worktree` and `rm --cached`. The history about this change [#1540].
### Fixed ### Fixed
- Updatenotification module: Properly handle race conditions, prevent crash. - Updatenotification module: Properly handle race conditions, prevent crash.

2
package.json
View File

@ -7,7 +7,7 @@
"start": "sh run-start.sh", "start": "sh run-start.sh",
"install": "cd vendor && npm install", "install": "cd vendor && npm install",
"install-fonts": "cd fonts && npm install", "install-fonts": "cd fonts && npm install",
"postinstall": "sh installers/postinstall/postinstall.sh && npm run install-fonts", "postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts",
"test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
"test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
"test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",

3
run-start.sh
View File

@ -1,3 +1,6 @@
./untrack-css.sh
if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty if [ -z "$DISPLAY" ]; then #If not set DISPLAY is SSH remote or tty
export DISPLAY=:0 # Set by default display export DISPLAY=:0 # Set by default display
fi fi

11
untrack-css.sh Executable file
View File

@ -0,0 +1,11 @@
# Long history here
# https://github.com/MichMich/MagicMirror/pull/1540
STATUS_CUSTOM_CSS=$(git ls-files -v css/custom.css|cut -f 1 --delimiter=" ")
if [ "$STATUS_CUSTOM_CSS" = "H" ]; then
echo "We'll remove from the repository the css/custom.css"
echo "This script apply git update-index --skip-worktree css/custom.css"
git update-index --skip-worktree css/custom.css
git rm --cached css/custom.css
fi