16mm
/
mcopy
1
0
Fork 0
Code Issues 15 Pull Requests Projects 2 Releases 13 Wiki Activity

Compare commits

base: 16mm:6116ada2fdfb5932e100bcf5ad1f14f129b57be5
Branches Tags
16mm:main
16mm:1.7.0
16mm:1.6.9
16mm:1.6.4
16mm:1.6.7
16mm:v1.6.4
16mm:1.6.2
16mm:1.6.1
16mm:v1.5.2
16mm:v1.5.1
16mm:1.5.1
16mm:1.5.2
16mm:v1.5.0
16mm:1.5.0
16mm:1.4.9
16mm:1.2.0
16mm:1.0.3
16mm:1.0.0
...
compare: 16mm:c152806511d6d80836c246a1edd13dbcc660db98
Branches Tags
16mm:main
16mm:1.7.0
16mm:1.6.9
16mm:1.6.4
16mm:1.6.7
16mm:v1.6.4
16mm:1.6.2
16mm:1.6.1
16mm:v1.5.2
16mm:v1.5.1
16mm:1.5.1
16mm:1.5.2
16mm:v1.5.0
16mm:1.5.0
16mm:1.4.9
16mm:1.2.0
16mm:1.0.3
16mm:1.0.0

4 Commits
6116ada2fd ... c152806511

Author SHA1 Message Date
Matt McWilliams c152806511 Now it works. 2023-02-19 01:27:19 -05:00
Matt McWilliams 4d9454daf2 Patch script now working 2023-02-19 01:22:44 -05:00
Matt McWilliams e754c65602 Increment patch without npm install 2023-02-19 01:20:51 -05:00
Matt McWilliams b672921c84 Increment patch number on commit 2023-02-19 01:18:03 -05:00
7 changed files with 16 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
app/package-lock.json generated
View File

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

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.1", "version": "1.7.5",
"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": {

6
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.1", "version": "1.7.5",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -185,8 +185,8 @@
"camera_capper_projectors_identifier": "0", "camera_capper_projectors_identifier": "0",
"capper_on": "A", "capper_on": "A",
"capper_off": "B", "capper_off": "B",
"takeup_forward" : "D", "takeup_forward": "D",
"takeup_backward" : "E" "takeup_backward": "E"
} }
} }
} }

4
package-lock.json generated
View File

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

2
package.json
View File

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

3
scripts/pre_commit.sh Normal file
View File

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

5
scripts/version.sh
View File

@ -6,10 +6,13 @@ 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"
declare -a fileArr=("./data/cfg.json" "./app/package.json") fit add ./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