From 2e713c9c158c6e09e18a4a1e2d890bc4c2a0d580 Mon Sep 17 00:00:00 2001 From: Matt Gates Date: Sun, 23 Jul 2017 09:18:04 -0400 Subject: [PATCH 1/4] add gitattributes file --- .gitattributes | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c0cb644 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,189 @@ +## GITATTRIBUTES FOR WEB PROJECTS +# +# These settings are for any web project. +# +# Details per file setting: +# text These files should be normalized (i.e. convert CRLF to LF). +# binary These files are binary and should be left untouched. +# +# Note that binary is a macro for -text -diff. +###################################################################### + +## AUTO-DETECT +## Handle line endings automatically for files detected as +## text and leave all files detected as binary untouched. +## This will handle all files NOT defined below. +* text=auto + +## SOURCE CODE +*.bat text eol=crlf +*.coffee text +*.css text +*.htm text +*.html text +*.inc text +*.ini text +*.js text +*.json text +*.jsx text +*.less text +*.od text +*.onlydata text +*.php text +*.pl text +*.py text +*.rb text +*.sass text +*.scm text +*.scss text +*.sh text eol=lf +*.sql text +*.styl text +*.tag text +*.ts text +*.tsx text +*.xml text +*.xhtml text + +## DOCKER +*.dockerignore text +Dockerfile text + +## DOCUMENTATION +*.markdown text +*.md text +*.mdwn text +*.mdown text +*.mkd text +*.mkdn text +*.mdtxt text +*.mdtext text +*.txt text +AUTHORS text +CHANGELOG text +CHANGES text +CONTRIBUTING text +COPYING text +copyright text +*COPYRIGHT* text +INSTALL text +license text +LICENSE text +NEWS text +readme text +*README* text +TODO text + +## TEMPLATES +*.dot text +*.ejs text +*.haml text +*.handlebars text +*.hbs text +*.hbt text +*.jade text +*.latte text +*.mustache text +*.njk text +*.phtml text +*.tmpl text +*.tpl text +*.twig text + +## LINTERS +.csslintrc text +.eslintrc text +.jscsrc text +.jshintrc text +.jshintignore text +.stylelintrc text + +## CONFIGS +*.bowerrc text +*.cnf text +*.conf text +*.config text +.browserslistrc text +.editorconfig text +.gitattributes text +.gitconfig text +.gitignore text +.htaccess text +*.npmignore text +*.yaml text +*.yml text +browserslist text +Makefile text +makefile text + +## HEROKU +Procfile text +.slugignore text + +## GRAPHICS +*.ai binary +*.bmp binary +*.eps binary +*.gif binary +*.ico binary +*.jng binary +*.jp2 binary +*.jpg binary +*.jpeg binary +*.jpx binary +*.jxr binary +*.pdf binary +*.png binary +*.psb binary +*.psd binary +*.svg text +*.svgz binary +*.tif binary +*.tiff binary +*.wbmp binary +*.webp binary + +## AUDIO +*.kar binary +*.m4a binary +*.mid binary +*.midi binary +*.mp3 binary +*.ogg binary +*.ra binary + +## VIDEO +*.3gpp binary +*.3gp binary +*.as binary +*.asf binary +*.asx binary +*.fla binary +*.flv binary +*.m4v binary +*.mng binary +*.mov binary +*.mp4 binary +*.mpeg binary +*.mpg binary +*.swc binary +*.swf binary +*.webm binary + +## ARCHIVES +*.7z binary +*.gz binary +*.rar binary +*.tar binary +*.zip binary + +## FONTS +*.ttf binary +*.eot binary +*.otf binary +*.woff binary +*.woff2 binary + +## EXECUTABLES +*.exe binary +*.pyc binary \ No newline at end of file From 51cd1c7a006d4b5c8ed1839b318dac7452afb925 Mon Sep 17 00:00:00 2001 From: Matt Gates Date: Sun, 23 Jul 2017 09:18:46 -0400 Subject: [PATCH 2/4] Introduce end-of-line normalization --- fluxion.sh | 0 install/add.py | 0 install/arch-install.sh | 0 install/install.sh | 0 install/remove.py | 0 language/bundle.sh | 0 lib/airmon/airmon.sh | 0 lib/exitmode.sh | 0 locale/de_DE.py | 0 locale/en_EN.py | 0 locale/en_EN.pyc | Bin scripts/router.sh | 0 siteinstaller.py | 0 13 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 fluxion.sh mode change 100755 => 100644 install/add.py mode change 100755 => 100644 install/arch-install.sh mode change 100755 => 100644 install/install.sh mode change 100755 => 100644 install/remove.py mode change 100755 => 100644 language/bundle.sh mode change 100755 => 100644 lib/airmon/airmon.sh mode change 100755 => 100644 lib/exitmode.sh mode change 100755 => 100644 locale/de_DE.py mode change 100755 => 100644 locale/en_EN.py mode change 100755 => 100644 locale/en_EN.pyc mode change 100755 => 100644 scripts/router.sh mode change 100755 => 100644 siteinstaller.py diff --git a/fluxion.sh b/fluxion.sh old mode 100755 new mode 100644 diff --git a/install/add.py b/install/add.py old mode 100755 new mode 100644 diff --git a/install/arch-install.sh b/install/arch-install.sh old mode 100755 new mode 100644 diff --git a/install/install.sh b/install/install.sh old mode 100755 new mode 100644 diff --git a/install/remove.py b/install/remove.py old mode 100755 new mode 100644 diff --git a/language/bundle.sh b/language/bundle.sh old mode 100755 new mode 100644 diff --git a/lib/airmon/airmon.sh b/lib/airmon/airmon.sh old mode 100755 new mode 100644 diff --git a/lib/exitmode.sh b/lib/exitmode.sh old mode 100755 new mode 100644 diff --git a/locale/de_DE.py b/locale/de_DE.py old mode 100755 new mode 100644 diff --git a/locale/en_EN.py b/locale/en_EN.py old mode 100755 new mode 100644 diff --git a/locale/en_EN.pyc b/locale/en_EN.pyc old mode 100755 new mode 100644 diff --git a/scripts/router.sh b/scripts/router.sh old mode 100755 new mode 100644 diff --git a/siteinstaller.py b/siteinstaller.py old mode 100755 new mode 100644 From 4bab0508c59e0d90eb919d88bfbf7d0544906e63 Mon Sep 17 00:00:00 2001 From: Matt Gates Date: Sun, 23 Jul 2017 09:24:56 -0400 Subject: [PATCH 3/4] Introduce end-of-line normalization --- fluxion.sh | 8 ++++---- language/{source => source.sh} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename language/{source => source.sh} (100%) diff --git a/fluxion.sh b/fluxion.sh index 1966cf2..9b28e2a 100644 --- a/fluxion.sh +++ b/fluxion.sh @@ -134,7 +134,7 @@ trap exitmode SIGINT SIGHUP source lib/exitmode.sh #Languages for the web interface -source language/source +source language/source.sh # Design function top(){ @@ -1352,7 +1352,7 @@ function ConnectionRESET { echo totallines=46 # number of selection lines to print itemprinted=0 - + for line in $( seq 1 $((totallines/2+1)) ); do for column in {0..1}; do n=$line @@ -1416,8 +1416,8 @@ function ConnectionRESET { done echo done - - + + echo echo -n "#? " read webconf diff --git a/language/source b/language/source.sh similarity index 100% rename from language/source rename to language/source.sh From 29af42c5c8de3eea03469545ac19a0c59ffe2e07 Mon Sep 17 00:00:00 2001 From: Matt Gates Date: Sun, 23 Jul 2017 09:27:32 -0400 Subject: [PATCH 4/4] Introduce end-of-line normalization --- .gitattributes | 2 ++ language/source.sh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index c0cb644..14bfd12 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,8 @@ ## This will handle all files NOT defined below. * text=auto +languages/* text eol=lf + ## SOURCE CODE *.bat text eol=crlf *.coffee text diff --git a/language/source.sh b/language/source.sh index 2584807..36b8527 100644 --- a/language/source.sh +++ b/language/source.sh @@ -21,10 +21,10 @@ source $WORK_DIR/sites/neutra/por source $WORK_DIR/sites/neutra/rus #TR -source $WORK_DIR/sites/neutra/tr +source $WORK_DIR/sites/neutra/tr #RO -source $WORK_DIR/sites/neutra/ro +source $WORK_DIR/sites/neutra/ro #HU source $WORK_DIR/sites/neutra/hu @@ -33,10 +33,10 @@ source $WORK_DIR/sites/neutra/hu source $WORK_DIR/sites/neutra/ara #CN -source $WORK_DIR/sites/neutra/cn +source $WORK_DIR/sites/neutra/cn #GR -source $WORK_DIR/sites/neutra/gr +source $WORK_DIR/sites/neutra/gr #CZ source $WORK_DIR/sites/neutra/cz @@ -47,7 +47,7 @@ source $WORK_DIR/sites/neutra/no #BG source $WORK_DIR/sites/neutra/bg -#SRB +#SRB source $WORK_DIR/sites/neutra/srb #PL @@ -62,13 +62,13 @@ source $WORK_DIR/sites/neutra/nl #DAN source $WORK_DIR/sites/neutra/dan -#TH +#TH source $WORK_DIR/sites/neutra/th -#HE +#HE source $WORK_DIR/sites/neutra/he -#Portuguese +#Portuguese source $WORK_DIR/sites/neutra/por # SVN