fix cp script with conflict

im6 · Mar 7, 2021 · 5109fd0 · 5109fd0
1 parent 8a18489
commit 5109fd0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,22 @@ Source code to generate [www.javascript.fun](https://www.javascript.fun/)
 
 ## Quick Start
 
+### Run app in local
+
 ```sh
 yarn install
-yarn build # generate collect build
+yarn dev
+```
+
+### Update viewmodel
+
+```sh
+yarn build
 yarn collect
 ```
+
+### Push to prod
+
+```sh
+yarn cp
+```
diff --git a/cp.sh b/cp.sh
@@ -5,6 +5,11 @@ if [ ! -d "$im6_dir" ]; then
   exit 1
 fi
 
+cd $im6_dir
+git pull
+
+cd ../javascript-fun
+
 # copy
 # cp dist/public/main.js "$im6_dir/assets/"
 # cp dist/public/site.js "$im6_dir/assets/"
@@ -20,4 +25,4 @@ cd $im6_dir
 git add .
 git commit -a -m "update"
 git push
-exit 0
+exit 0