diff options
| author | Devlin Junker <devlin.junker@gmail.com> | 2022-11-09 21:52:11 -0800 |
|---|---|---|
| committer | Benjamin Brahmer <info@b-brahmer.de> | 2022-11-17 14:50:53 +0100 |
| commit | c6b4bcc00e5202e85388a0624d149e8b1df386f8 (patch) | |
| tree | 7063a29710dfd0a363f3462fee8a0e8185488e15 /Makefile | |
| parent | 760c44288256b104b662ade7a892a6ec0b898851 (diff) | |
upmerging master into vue-rewrite
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -83,6 +83,8 @@ endif # Installs npm dependencies .PHONY: npm npm: + $(npm) ci + $(npm) run build ifneq (, $(npm)) $(npm) run build else @@ -171,12 +173,15 @@ appstore: # on macOS there is no option "--parents" for the "cp" command mkdir -p $(appstore_sign_dir)/$(app_name)/js/build $(appstore_sign_dir)/$(app_name)/js/admin cp js/build/app.min.js $(appstore_sign_dir)/$(app_name)/js/build - cp js/admin/Admin.js $(appstore_sign_dir)/$(app_name)/js/admin + cp js/build/news-admin-settings.js* $(appstore_sign_dir)/$(app_name)/js/build # export the key and cert to a file - mkdir -p $(cert_dir) - php ./bin/tools/file_from_env.php "app_private_key" "$(cert_dir)/$(app_name).key" - php ./bin/tools/file_from_env.php "app_public_crt" "$(cert_dir)/$(app_name).crt" + @if [ ! -f $(cert_dir)/$(app_name).key ] || [ ! -f $(cert_dir)/$(app_name).crt ]; then \ + echo "Key and cert do not exist"; \ + mkdir -p $(cert_dir); \ + php ./bin/tools/file_from_env.php "app_private_key" "$(cert_dir)/$(app_name).key"; \ + php ./bin/tools/file_from_env.php "app_public_crt" "$(cert_dir)/$(app_name).crt"; \ + fi @if [ -f $(cert_dir)/$(app_name).key ]; then \ echo "Signing app files…"; \ @@ -215,4 +220,12 @@ test: php-test-dependencies .PHONY: feed-test feed-test: - ./bin/tools/check_feeds.sh
\ No newline at end of file + ./bin/tools/check_feeds.sh + +.PHONY: feed-server +feed-server: + php -S 127.0.0.1:8090 -t $(CURDIR)/tests/test_helper/feeds + +.PHONY: nextcloud-server +nextcloud-server: + php -S 127.0.0.1:8080 -t $(CURDIR)/../../.
\ No newline at end of file |