Merge pull request #10 from YunoHost-Apps/testing

Testing

check_process

@@ -13,7 +13,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=03c3ea18cf117127749a860afe538bc6070a8e0b
+#		upgrade=1	from_commit=03c3ea18cf117127749a860afe538bc6070a8e0b
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@@ -35,7 +35,7 @@
 ;;; Options
 Email=ljf+ynh-strut@grimaud.me
 Notification=down
-;;; Upgrade options
+#;;; Upgrade options
-	; commit=03c3ea18cf117127749a860afe538bc6070a8e0b
+#	; commit=03c3ea18cf117127749a860afe538bc6070a8e0b
-		name=Update package to level 7
+#		name=Update package to level 7
-		manifest_arg=domain=DOMAIN&path=PATH&is_public=Yes&
+#		manifest_arg=domain=DOMAIN&path=PATH&is_public=Yes&

conf/app.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/YunoHost-Apps/strut_ynh/archive/ebd1e859cb1ecc0cc3166969fc1db649f3ddb61c.tar.gz
+SOURCE_URL=https://github.com/MohannadNaj/Strut/archive/467fcb8a6436c84f2acb8ffb31b954d5eb3655b8.tar.gz
-SOURCE_SUM=6178b9b614c16167945804bdc460101324245b232215d993a5ae3b3bc38b8db6
+SOURCE_SUM=d138ec3116b507d1fc3608f0c8bbb7601a68824403cb20617a80af1906bff3ab
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=strut-20160915-1.tar.gz
+SOURCE_FILENAME=strut-20160915-3.tar.gz

manifest.json

@@ -2,7 +2,7 @@
     "name": "Strut",
     "id": "strut",
     "packaging_format": 1,
-    "version": "20160915-2",
+    "version": "20171224-1",
     "url": "http://strut.io",
     "license": "AGPL-3.0",
     "requirements": {

pull_request_template.md

@@ -0,0 +1,25 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how you fix that*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Validation
+---
+*Minor decision*
+- **Upgrade previous version** : 
+- [ ] **Code review** : 
+- [ ] **Approval (LGTM)** : 
+- [ ] **Approval (LGTM)** : 
+- **CI succeeded** : 
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/strut_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/strut_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.*  
+or  
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/strut_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/strut_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.*  
+When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

scripts/install

@@ -47,7 +47,10 @@ ynh_clean_setup () {
     ynh_secure_remove "$tmp_dir"
 }
 ynh_setup_source "$tmp_dir"
-mv "$tmp_dir/sources"  "$final_path"
+mv "$tmp_dir/dist"  "$final_path"
+# Imgur is deactivated on the specific upstream selected, but this text is still here
+# Don't use a patch because it's minified js
+ynh_replace_string "are currently uploaded to imgur.*re working on changing this" "size is limited" "$final_path/scripts/amd-app.js"
 ynh_secure_remove "$tmp_dir"
 #=================================================
 # NGINX CONFIGURATION

scripts/upgrade

@@ -75,7 +75,11 @@ path_url=$(ynh_normalize_url_path $path_url)
 # For this app sources are in app subdirectory 
 tmp_dir=$(mktemp -d)
 ynh_setup_source "$tmp_dir"
-cp -R "$tmp_dir/sources/."  "$final_path/"
+# Dist is the compiled version. Other directories are source code and tools to build the program
+cp -R "$tmp_dir/dist/."  "$final_path/"
+# Imgur is deactivated on the specific upstream selected, but this text is still here
+# Don't use a patch because it's minified js
+ynh_replace_string "are currently uploaded to imgur.*re working on changing this" "size is limited" "$final_path/scripts/amd-app.js"
 ynh_secure_remove "$tmp_dir"
 
 #=================================================

sources/patches/app-00-remove-google.patch

@@ -0,0 +1,25 @@
+--- a/dist/index.html
++++ b/dist/index.html
+@@ -15,15 +15,6 @@
+ 		<link rel="apple-touch-icon-precomposed" href="img/strut-touch.png">
+ 		<link rel="stylesheet" type="text/css" href="styles/built.css">
+ 		<script type="text/javascript" src="preview_export/download_assist/swfobject.js"></script>
+-		<script>
+-  	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-  	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-  	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-  	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-  	ga('create', 'UA-42322531-1', 'strut.io');
+-  	ga('send', 'pageview');
+-	</script>
+ 	</head>
+ 	<body class="bg-default">
+ 		<!--[IF IE]>
+@@ -124,4 +115,4 @@
+ 		<div id="modals">
+ 		</div>
+ 	</body>
+-</html>
+\ No newline at end of file
++</html>