From 4b2c5511861060df0791cc2f9aafeca8565f2659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@selfhost.fr>
Date: Tue, 10 Feb 2015 17:50:30 +0100
Subject: [PATCH] [enh]Final cleanup for 1.0

---
 conf/dist_user.conf | 62 ---------------------------------------------
 scripts/install     |  6 -----
 2 files changed, 68 deletions(-)
 delete mode 100644 conf/dist_user.conf

diff --git a/conf/dist_user.conf b/conf/dist_user.conf
deleted file mode 100644
index 87de38a..0000000
--- a/conf/dist_user.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
- return array (
-  'language' => 'en',
-  'old_entries' => 3,
-  'keep_history_default' => 0,
-  'ttl_default' => 3600,
-  'mail_login' => '',
-  'token' => '',
-  'passwordHash' => '',
-  'apiPasswordHash' => '',
-  'posts_per_page' => 20,
-  'view_mode' => 'normal',
-  'default_view' => 2,
-  'auto_load_more' => true,
-  'display_posts' => true,
-  'onread_jump_next' => true,
-  'lazyload' => true,
-  'sticky_post' => true,
-  'reading_confirm' => false,
-  'sort_order' => 'DESC',
-  'anon_access' => false,
-  'mark_when' =>
-  array (
-    'article' => true,
-    'site' => true,
-    'scroll' => false,
-    'reception' => false,
-  ),
-  'theme' => 'Flat',
-  'content_width' => 'thin',
-  'shortcuts' =>
-  array (
-    'mark_read' => 'r',
-    'mark_favorite' => 'f',
-    'go_website' => 'space',
-    'next_entry' => 'n',
-    'prev_entry' => 'k',
-    'first_entry' => 'home',
-    'last_entry' => 'end',
-    'collapse_entry' => 'c',
-    'load_more' => 'm',
-    'auto_share' => 's',
-    'focus_search' => 'a',
-  ),
-  'topline_read' => true,
-  'topline_favorite' => true,
-  'topline_date' => true,
-  'topline_link' => true,
-  'bottomline_read' => true,
-  'bottomline_favorite' => true,
-  'bottomline_sharing' => true,
-  'bottomline_tags' => true,
-  'bottomline_date' => true,
-  'bottomline_link' => true,
-  'sharing' =>
-  array (sharingArrayYnh),
-  'queries' =>
-  array (
-  ),
-  'html5_notif_timeout' => 0,
-  'user' => 'YnoUser',
-);
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 6dca416..98f4f60 100755
--- a/scripts/install
+++ b/scripts/install
@@ -58,7 +58,6 @@ if [[ $(sudo yunohost app list -f wallabag | /bin/grep -q "installed: True") -eq
     echo "Detected wallabag"
 	wallabagPath=$(sudo yunohost app setting wallabag path)
 	wallabagUrl=$domain$wallabagPath
-	# sharingWallabag="'sharing' => array( 0 => array('type' => 'wallabag','name' => 'Wallabag','url' => 'https://$wallabagUrl',),"
 	sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t),"
 	sharingEnable=1
 fi
@@ -74,9 +73,7 @@ do
 	mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
 	#remove temp sql
 	sudo rm /tmp/$myuser-install.sql
-	#sudo mkdir $final_path/data/users/$myuser/
 	#copy default conf
-	#sudo cp ../conf/dist_user.conf $final_path/data/users/$myuser/config.php
 	sudo cp -r $final_path/data/users/_/ $final_path/data/users/$myuser
 	sudo mv $final_path/data/users/$myuser/config.default.php $final_path/data/users/$myuser/config.php
 
@@ -84,9 +81,6 @@ do
 		sudo sed -i "s@'sharing'\ =>\ array\ (@$sharingWallabag@g" $final_path/data/users/$myuser/config.php
 	fi
 done
-#copy defaut user conf for futur users
-sudo cp ../conf/dist_user.conf $final_path/data/user.php.dist
-
 # Delete install directive
 sudo rm $final_path/data/do-install.txt