diff options
author | Johannes Schauer <josch@debian.org> | 2018-02-20 14:13:52 +0100 |
---|---|---|
committer | Johannes 'josch' Schauer <josch@debian.org> | 2019-01-06 23:42:23 +0100 |
commit | 750dac32c3bf692ad5afb7f70ca939067f9a1f0b (patch) | |
tree | 15cd8beceb3398a09d39d73a4ac901d76da6358c | |
parent | ed48940eb3d6c12d9800bf7b490530d80c969e83 (diff) |
Apply debian specific patches
-rwxr-xr-x | manage.sh | 16 | ||||
-rw-r--r-- | searx/settings.yml | 4 | ||||
-rw-r--r-- | searx/static/themes/oscar/gruntfile.js | 14 | ||||
-rw-r--r-- | searx/static/themes/simple/gruntfile.js | 19 | ||||
-rw-r--r-- | searx/static/themes/simple/js/searx_src/autocomplete.js | 49 | ||||
-rw-r--r-- | setup.py | 16 |
6 files changed, 68 insertions, 50 deletions
@@ -110,8 +110,7 @@ tests() { # npm_path_setup() { - which npm || (printf 'Error: npm is not found\n'; exit 1) - export PATH="$(npm bin)":$PATH + true } npm_packages() { @@ -133,7 +132,7 @@ npm_packages() { build_style() { npm_path_setup - lessc --clean-css="--s1 --advanced --compatibility=ie9" "$BASE_DIR/searx/static/$1" "$BASE_DIR/searx/static/$2" + lessc -x "$BASE_DIR/searx/static/$1" "$BASE_DIR/searx/static/$2" } styles() { @@ -147,8 +146,15 @@ styles() { build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css echo '[!] Building pix-art style' build_style themes/pix-art/less/style.less themes/pix-art/css/style.css - echo '[!] Building bootstrap style' - build_style less/bootstrap/bootstrap.less css/bootstrap.min.css + echo '[!] Building simple style' + build_style themes/simple/less/style.less themes/simple/css/searx.min.css + build_style themes/simple/less/style-rtl.less themes/simple/css/searx-rtl.min.css + echo '[!] Building logicodev' + build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css + echo '[!] Building logicodev-dark' + build_style themes/oscar/less/logicodev-dark/oscar.less themes/oscar/css/logicodev-dark.min.css + echo '[!] Building pointhi' + build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css } grunt_build() { diff --git a/searx/settings.yml b/searx/settings.yml index 00b001b..db20d7c 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -18,8 +18,8 @@ server: http_protocol_version : "1.0" # 1.0 and 1.1 are supported ui: - static_path : "" # Custom static path - leave it blank if you didn't change - templates_path : "" # Custom templates path - leave it blank if you didn't change + static_path : "/usr/share/python3-searx/static" # Custom static path - leave it blank if you didn't change + templates_path : "/usr/share/python3-searx/templates" # Custom templates path - leave it blank if you didn't change default_theme : oscar # ui theme default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section theme_args : diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js index 5913994..5390278 100644 --- a/searx/static/themes/oscar/gruntfile.js +++ b/searx/static/themes/oscar/gruntfile.js @@ -81,16 +81,8 @@ module.exports = function(grunt) { } }); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-less'); - - grunt.registerTask('test', ['jshint']); - - grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']); - - grunt.registerTask('styles', ['less']); + grunt.loadNpmTasks('grunt-contrib-uglify', '/usr/lib/nodejs'); + grunt.loadNpmTasks('grunt-contrib-concat', '/usr/lib/nodejs'); + grunt.registerTask('default', ['concat', 'uglify']); }; diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index a0f9fd7..3cc52cb 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -64,12 +64,6 @@ module.exports = function(grunt) { production: { options: { paths: ["less"], - plugins: [ - new (require('less-plugin-clean-css'))({ - advanced: true, - compatibility: '*' - }) - ], banner: '/*! searx | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' }, files: { @@ -144,15 +138,8 @@ module.exports = function(grunt) { } }); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-less'); - grunt.loadNpmTasks('grunt-contrib-cssmin'); - grunt.loadNpmTasks('grunt-webfont'); + grunt.loadNpmTasks('grunt-contrib-uglify', '/usr/lib/nodejs'); + grunt.loadNpmTasks('grunt-contrib-concat', '/usr/lib/nodejs'); - grunt.registerTask('test', ['jshint']); - - grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less:development', 'less:production']); + grunt.registerTask('default', ['concat', 'uglify']); }; diff --git a/searx/static/themes/simple/js/searx_src/autocomplete.js b/searx/static/themes/simple/js/searx_src/autocomplete.js index b95fbcf..4bbe017 100644 --- a/searx/static/themes/simple/js/searx_src/autocomplete.js +++ b/searx/static/themes/simple/js/searx_src/autocomplete.js @@ -1,4 +1,51 @@ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.AutoComplete = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){ +(function(f){ + if(typeof exports=== "object" && typeof module !== "undefined") { + module.exports = f() + } else if(typeof define === "function" && define.amd) { + define([], f) + }else{ + var g; + if(typeof window !== "undefined") { + g = window + } else if(typeof global !== "undefined") { + g = global + } else if(typeof self !== "undefined") { + g = self + } else { + g = this + } + g.AutoComplete = f() + } +})(function(){ + var define, module, exports; + return (function e(t, n, r){ + function s(o, u){ + if(!n[o]){ + if(!t[o]){ + var a = typeof require == "function" && require; + if(!u && a) + return a(o, !0); + if(i) + return i(o, !0); + var f = new Error("Cannot find module '" + o + "'"); + throw f.code = "MODULE_NOT_FOUND", f + } + var l = n[o] = { + exports:{} + }; + t[o][0].call(l.exports,function(e) { + var n = t[o][1][e]; + return s(n?n:e) + }, l, l.exports, e, t, n, r) + } + return n[o].exports + } + var i = typeof require == "function" && require; + for(var o = 0; o < r.length; o++) + s(r[o]); + return s + })({ + 1:[function(require, module, exports){ /* * @license MIT * @@ -51,23 +51,9 @@ setup( }, package_data={ 'searx': [ - 'settings.yml', - '../README.rst', - '../requirements.txt', - '../requirements-dev.txt', 'data/*', 'plugins/*/*', - 'static/*.*', - 'static/*/*.*', - 'static/*/*/*.*', - 'static/*/*/*/*.*', - 'static/*/*/*/*/*.*', - 'templates/*/*.*', - 'templates/*/*/*.*', - 'tests/*', - 'tests/*/*', - 'tests/*/*/*', - 'translations/*/*/*' + 'translations/*/*/*.mo' ], }, |