diff --git a/Cargo.lock b/Cargo.lock index 8025a94d9..96ef26ba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [root] name = "super-analyzer" -version = "0.4.0-dev" +version = "0.4.0" dependencies = [ "abxml 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytecount 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 2c22412ad..f3cdf9929 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "super-analyzer" -version = "0.4.0-dev" +version = "0.4.0" authors = [ "Iban Eguia ", "Jaime Salas ", @@ -97,24 +97,24 @@ assets = [ ["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-writer-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"], ["vendor/dex2jar-2.1-SNAPSHOT/lib/dx-1.7.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"], #CSS - ["templates/super-analyzer/css/androidstudio.css", "usr/share/super-analyzer/templates/super-analyzer/css/", "644"], - ["templates/super-analyzer/css/style.css", "usr/share/super-analyzer/templates/super-analyzer/css/", "644"], + ["templates/super/css/androidstudio.css", "usr/share/super-analyzer/templates/super/css/", "644"], + ["templates/super/css/style.css", "usr/share/super-analyzer/templates/super/css/", "644"], # Images - ["templates/super-analyzer/img/folder-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"], - ["templates/super-analyzer/img/java-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"], - ["templates/super-analyzer/img/xml-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"], - ["templates/super-analyzer/img/report.png", "usr/share/super-analyzer/vendor/results_template/img/", "644"], - ["templates/super-analyzer/img/logo.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"], + ["templates/super/img/folder-icon.png", "usr/share/super-analyzer/templates/super/img/", "644"], + ["templates/super/img/java-icon.png", "usr/share/super-analyzer/templates/super/img/", "644"], + ["templates/super/img/xml-icon.png", "usr/share/super-analyzer/templates/super/img/", "644"], + ["templates/super/img/report.png", "usr/share/super-analyzer/vendor/results_template/img/", "644"], + ["templates/super/img/logo.png", "usr/share/super-analyzer/templates/super/img/", "644"], # JavaScript - ["templates/super-analyzer/js/highlight.js.LICENSE", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"], - ["templates/super-analyzer/js/highlight.pack.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"], - ["templates/super-analyzer/js/jquery-3.2.0.slim.min.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"], - ["templates/super-analyzer/js/src_nav.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"], + ["templates/super/js/highlight.js.LICENSE", "usr/share/super-analyzer/templates/super/js/", "644"], + ["templates/super/js/highlight.pack.js", "usr/share/super-analyzer/templates/super/js/", "644"], + ["templates/super/js/jquery-3.2.0.slim.min.js", "usr/share/super-analyzer/templates/super/js/", "644"], + ["templates/super/js/src_nav.js", "usr/share/super-analyzer/templates/super/js/", "644"], # templates - ["templates/super-analyzer/code.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"], - ["templates/super-analyzer/report.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"], - ["templates/super-analyzer/src.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"], - ["templates/super-analyzer/vulnerability.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"], + ["templates/super/code.hbs", "usr/share/super-analyzer/templates/super/", "644"], + ["templates/super/report.hbs", "usr/share/super-analyzer/templates/super/", "644"], + ["templates/super/src.hbs", "usr/share/super-analyzer/templates/super/", "644"], + ["templates/super/vulnerability.hbs", "usr/share/super-analyzer/templates/super/", "644"], # Config ["rules.json", "etc/super-analyzer/", "644"], ["config.toml", "etc/super-analyzer/", "644"], diff --git a/README.md b/README.md index 2661bbad9..f50574b02 100644 --- a/README.md +++ b/README.md @@ -93,11 +93,11 @@ This program is free software: you can redistribute it and/or modify it under th General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -[linux_mac_build_img]: https://travis-ci.org/SUPERAndroidAnalyzer/super.svg?branch=develop +[linux_mac_build_img]: https://travis-ci.org/SUPERAndroidAnalyzer/super.svg?branch=master [linux_mac_build]: https://travis-ci.org/SUPERAndroidAnalyzer/super -[windows_build_img]: https://ci.appveyor.com/api/projects/status/7xuikqyne4a2jn7e/branch/develop?svg=true -[windows_build]: https://ci.appveyor.com/project/Razican/super/branch/develop -[coverage_img]: https://codecov.io/gh/SUPERAndroidAnalyzer/super/branch/develop/graph/badge.svg +[windows_build_img]: https://ci.appveyor.com/api/projects/status/7xuikqyne4a2jn7e/branch/master?svg=true +[windows_build]: https://ci.appveyor.com/project/Razican/super/branch/master +[coverage_img]: https://codecov.io/gh/SUPERAndroidAnalyzer/super/branch/master/graph/badge.svg [coverage]: https://codecov.io/gh/SUPERAndroidAnalyzer/super [compile]: http://superanalyzer.rocks/download.html#compile-from-source [downloads]: http://superanalyzer.rocks/download.html diff --git a/rpmbuild/super.spec b/rpmbuild/super.spec index ea0bc1f08..e3bb1bcae 100644 --- a/rpmbuild/super.spec +++ b/rpmbuild/super.spec @@ -38,10 +38,10 @@ install -p -m 755 target/release/_super %{buildroot}%{_datadir}/zsh/site-functio install -p -m 755 -D vendor/dex2jar-2.1-SNAPSHOT/lib/* %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/lib/ install -p -m 755 -D vendor/dex2jar-2.1-SNAPSHOT/*.sh %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/ install -p -m 644 -D vendor/dex2jar-2.1-SNAPSHOT/LICENSE.txt %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/ -install -p -m 644 -D templates/%{name}/css/* %{buildroot}%{_datadir}/%{name}/templates/super/css/ -install -p -m 644 -D templates/%{name}/img/* %{buildroot}%{_datadir}/%{name}/templates/super/img/ -install -p -m 644 -D templates/%{name}/js/* %{buildroot}%{_datadir}/%{name}/templates/super/js/ -install -p -m 644 -D templates/%{name}/*.hbs %{buildroot}%{_datadir}/%{name}/templates/super/ +install -p -m 644 -D templates/super/css/* %{buildroot}%{_datadir}/%{name}/templates/super/css/ +install -p -m 644 -D templates/super/img/* %{buildroot}%{_datadir}/%{name}/templates/super/img/ +install -p -m 644 -D templates/super/js/* %{buildroot}%{_datadir}/%{name}/templates/super/js/ +install -p -m 644 -D templates/super/*.hbs %{buildroot}%{_datadir}/%{name}/templates/super/ install -p -m 755 -D vendor/*.jar %{buildroot}%{_datadir}/%{name}/vendor/ install -p -m 644 -D vendor/*.txt %{buildroot}%{_datadir}/%{name}/vendor/ install -p -m 644 rules.json %{buildroot}%{_sysconfdir}/%{name}/