diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..88de8c90 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,37 @@ + + + +- Issue type: Bug report/Feature request + +### Short description + + + +### Environment + + - Operating system: + - Software version: + - Software source: + +### Steps to reproduce + +1. +2. +3. + +### Expected behaviour + + +### Actual behaviour + + + +### Usecase + + +### Description + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..46c6c51c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,10 @@ +### Short description +I have: +- [ ] There is a corresponding issue for this pull request. +- [ ] Mentioned the Issue number in the pull request commit message `Fixes # commit message` + +### For the reviewers +I have: +- [ ] Reviewed this pull request by an authorized contributor. +- [ ] The reviewer is assigned to the pull request. + diff --git a/.travis.yml b/.travis.yml index 16961ee4..a34a15e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,33 @@ # This provides us with GCC binary support so we can run bash +dist: trusty language: generic sudo: required script: - ./build.sh - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./scripts/aptRepoUpdater.sh; fi' + +notifications: +email: +recipients: + - xeon.harsh@gmail.com + - $email before_deploy: - export image_name="`echo *.iso`" - cat *.iso > "/home/travis/${image_name}" - -notifications: - slack: fossasia:3pMkQrSogvEMfnu9aJDW2ZYC + +on_success: always deploy: - provider: releases skip_cleanup: true + overwrite: true + tag_name: $TRAVIS_TAG api_key: - secure: "IBOHja2Ip9Zo0slYX12Ce8vYSiypw7frU8Wbn00ZIaGP+dWW6G1FP+Weo6ai4OnX9LMoxQtc1842rfq84N/yw8mFElB3EICJe+yjGzijINf56RW1EhQtrdbok/K95OiS8XNZtXh9hr+a3IX7f4ZtaydFALRcOUgR8gCJFkkujT6/+5VzeEefyYg6+JMz6jU2S9EGmows/UtR1Zo+2KnCKgMH89i9l/9kY+w+Z5vBYqEXx4xx623dzVkhln54Wz7VwEzK4I1kvy+kjy1X4NUQNI6JMKOEjsNZ4TUfR0VWKhKTVRt/E0UV6m6LFtvhwg9KYNb96/Sq3SUM5B9nVcwNvL+ZFOzYFxqCgwhtAn6UAhEoK8C292XPbaDbwc4qtm3RyX7tJ44+K2b060ZPkG0bc90ypvPxaBkHwYoY3r0oiOofCYnFnArc5zq6DaxeJE1+bMfVC14hr+lhPGLQ1uxb+FZ7r49Wt8U6kfgB+mpuW+/3YnNxeuOV+NzDWlQAIaBs0qGSD8ucAcUtb0pDaM52fZLtMwqiyMHd/rvcbiFT4DVoII3BRFFWyxRSiMQRGBnz+LkG+YORPv6PIJpnfcPNLXiqB6ndEkBUcmfnHkVs0B6cf2IGcICMN4rdIGW/v/EeT2E0+/C3Cf07CiPfZe7xedJfczlJeikmYsJpylm8HeI=" + secure: "KsbMe/CzvYmGvWoflBRjfiw8urvAZhNE/oL51HceeIeAeQ+Kr0jM/BRV+kG0c6scKwePknr02A7XqBwAEmUAYWNGd0TiRo5lIQxCONpPsYXwEtHSuA2+0pRuVN4qG+6sgYHvlNO7UbWgVu/aAapufTpIkUctHWHQRJUDN8+hUrfeRm4CjeA7Tz4y1KYzRNY4SrwQyEVLwxoTZ/DOuSjj3m40jrwOsBnql/SSYe6D8N2r0tv5Acs/qmClEUhQW26OB4tRRRgS9jXU2gni2ZEYV0h6D5aKehW6gWlZpK5Rdn5QEY2py+Mar29wF2nxAojD+chLgzxx3zjB5Dm6ERpzEznjffMEpBxlEEMO3uniOJjokn0k2IVsoZTvM9rCbBfFuD7+Ihv5nhZYM7Mc5iKZE1Tx6XW2ZX9LW7ebjP+jNmqLuBHUu3oAVeD9ZscdmHVnNFr1TNE+ZVAvSDfA73AaT+sT3TNF5SwYPyAH7uk8lHfUhS+rIAmX8efrSIUoaVSwy1Wzop6c2YbYGJq4RxqEEkCiE0aB6ldgXAA95uUcYzTkKL/i1myJK/DLpu+qV3AXhxVIpYqekhTEZmLMpCnXXEzPwsAe1CfEy4h0VV2ax51u+cAOhLcKZBRzDAJOd7dqAA6GpV24OOfP3VKqRxCWfYPtsLPoei6h9QWvWrYuC80=" file_glob: true # http://stackoverflow.com/a/28579635/1320237 file: "/home/travis/${image_name}" on: - branch: master + tags: true +branch: master diff --git a/README.md b/README.md index d4ea01b9..7b2aaf76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Meilix +# Meilix - generator branch [![Join the chat at https://gitter.im/fossasia/meilix](https://badges.gitter.im/fossasia/meilix.svg)](https://gitter.im/fossasia/meilix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/fossasia/meilix.svg?branch=master)](https://travis-ci.org/fossasia/meilix) @@ -44,6 +44,16 @@ Creating a metapackage is really easy, we will make use of [equivs](http://apt.u ***Note: Remember to replace nameOfYourMeta-package with the name of the meta-package** +### Personalizing it +Updating the OS/metapackage to the latest version +- For this, we need to update sources.list file to the version we desire. + +Customize the Browser +- For this, we need to edit chrome.json file found under meilix-default-settings. You can chnage homepage URL, default search-engine,etc. If you want to change some setting which is selected by default, then remove the comment and change its value from "1" to "0" or from "false" to "true" or vice-versa, depending upon the requirement. + +Know your OS +- Metapackage and distro information can be found in dists directory. + ## Communication Chat: [Slack Channel](http://fossasia.slack.com/messages/linux/) | [Get an Invite](http://fossasia-slack.herokuapp.com/) diff --git a/build.sh b/build.sh index 59c21a23..1baddf59 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,9 @@ datafiles="image-${arch}.tar.lzma sources.list" # Necessary development tool packages to be installed on build host devtools="debootstrap genisoimage p7zip-full squashfs-tools ubuntu-dev-tools" +url_wallpaper="https://meilix-generator.herokuapp.com/uploads/wallpaper" # url heroku wallpaper +wget $url_wallpaper -P meilix-default-settings/usr/share/meilix/images + # Make sure we have the data files we need for i in $datafiles do diff --git a/meilix-default-settings/etc/chromium-browser/policies/managed/chrome.json b/meilix-default-settings/etc/chromium-browser/policies/managed/chrome.json index fbdd5903..fb3cd758 100644 --- a/meilix-default-settings/etc/chromium-browser/policies/managed/chrome.json +++ b/meilix-default-settings/etc/chromium-browser/policies/managed/chrome.json @@ -359,7 +359,7 @@ // set when the 'DefaultSearchProviderEnabled' policy is enabled and will only // be respected if this is the case. - "DefaultSearchProviderSearchURL": "http://www.google.com/cse?cx=partner-pub-6065445074637525:8941524350&q={searchTerms}", + "DefaultSearchProviderSearchURL": "http://susper.com/search?query=%s", // Default search provider suggest URL //------------------------------------------------------------------------- @@ -671,7 +671,7 @@ // will allow the user to choose whether the new tab page is his home page on // his own. - "HomepageIsNewTabPage": false, + "HomepageIsNewTabPage": true, // Configure the home page URL //------------------------------------------------------------------------- @@ -684,7 +684,7 @@ // allow the user to choose his home page on his own if HomepageIsNewTabPage // is not set too. - "HomepageLocation": "http://www.google.com/cse/home?cx=partner-pub-6065445074637525:8941524350", + "HomepageLocation": "http://susper.com/", // Allow images on these sites //------------------------------------------------------------------------- @@ -1003,7 +1003,7 @@ // starts Google Chrome. If you enable this setting, users cannot change or // override it in Google Chrome. Disabling this setting is equvalent to // leaving it not configured. The user will still be able to change it in - // Google Chrome. + // Google Chrome. "RestoreOnStartup": 4, // URLs to open on startup @@ -1013,7 +1013,7 @@ // opened on start up. This policy only works if the 'RestoreOnStartup' // policy is set to 'RestoreOnStartupIsURLs'. - "RestoreOnStartupURLs": ["http://www.google.com/cse?cx=partner-pub-6065445074637525:8941524350"], + "RestoreOnStartupURLs": ["http://susper.com/"], // Enable Safe Browsing //------------------------------------------------------------------------- diff --git a/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf b/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf index 3e352d4a..68eb8a1b 100644 --- a/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf +++ b/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf @@ -4,7 +4,7 @@ su_cmd=gksu %s [desktop] wallpaper_mode=1 -wallpaper=/usr/share/meilix/images/xp_default_wallpaper.jpg +wallpaper=/usr/share/meilix/images/wallpaper desktop_bg=#000000 desktop_fg=#ffffff desktop_shadow=#000000 diff --git a/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg b/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg deleted file mode 100644 index 68d062e2..00000000 Binary files a/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg and /dev/null differ