Compare commits

..

No commits in common. "c152806511d6d80836c246a1edd13dbcc660db98" and "6116ada2fdfb5932e100bcf5ad1f14f129b57be5" have entirely different histories.

7 changed files with 10 additions and 16 deletions

4
app/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.5", "version": "1.7.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.2", "version": "1.7.1",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.5", "version": "1.7.1",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.5", "version": "1.7.1",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.7.5", "version": "1.7.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.7.5", "version": "1.7.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"arduino": "file:app/lib/arduino", "arduino": "file:app/lib/arduino",

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.7.4", "version": "1.7.1",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

View File

@ -1,3 +0,0 @@
#!/bin/bash
npm run patch

View File

@ -6,13 +6,10 @@ npm version --no-git-tag-version ${1}
version=$(jq -r '.version' ./package.json) version=$(jq -r '.version' ./package.json)
echo "VERSION: $version" echo "VERSION: $version"
fit add ./package.json declare -a fileArr=("./data/cfg.json" "./app/package.json")
declare -a fileArr=("./package-lock.json" "./data/cfg.json" "./app/package.json" "./app/package-lock.json")
for i in "${fileArr[@]}" for i in "${fileArr[@]}"
do do
tmp=$(mktemp) tmp=$(mktemp)
VERSION="$version" jq '.version = env.VERSION' "$i" > "$tmp" && mv "$tmp" "$i" VERSION="$version" jq '.version = env.VERSION' "$i" > "$tmp" && mv "$tmp" "$i"
git add "$i"
done done