frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #360 from glaszig/installer/cp-instead-of-mv

Browse Source 
installation: do not move files out of git tree
This commit is contained in:
Bill Zimmerman 2019-08-06 22:45:01 +02:00 committed by GitHub
commit d4d6dbd79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 92 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
_layouts/default.html Normal file
View File

@ -0,0 +1,74 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="msapplication-config" content="/dist/icons/browserconfig.xml">
<meta name="msapplication-TileColor" content="#b91d47">
<link rel="icon" type="image/png" sizes="32x32" href="/dist/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/dist/icons/favicon-16x16.png">
<link rel="icon" type="image/png" href="/dist/icons/favicon.png" />
<link rel="apple-touch-icon" sizes="180x180" href="/dist/icons/apple-touch-icon.png">
<link rel="mask-icon" href="/dist/icons/safari-pinned-tab.svg" color="#b91d47">
<link rel="manifest" href="/dist/icons/site.webmanifest">
{% seo %}
<link rel="stylesheet" href="{{ "/assets/css/style.css?v=" | append: site.github.build_revision | relative_url }}">
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
</head>
<body>
<div class="wrapper">
<header>
<h1><a href="{{ "/" | absolute_url }}">{{ site.title | default: site.github.repository_name }}</a></h1>
{% if site.logo %}
<img src="{{site.logo | relative_url}}" alt="Logo" />
{% endif %}
<p>{{ site.description | default: site.github.project_tagline }}</p>
{% if site.github.is_project_page %}
<p class="view"><a href="{{ site.github.repository_url }}">View the Project on GitHub <small>{{ site.github.repository_nwo }}</small></a></p>
{% endif %}
{% if site.github.is_user_page %}
<p class="view"><a href="{{ site.github.owner_url }}">View My GitHub Profile</a></p>
{% endif %}
{% if site.show_downloads %}
<ul class="downloads">
<li><a href="{{ site.github.zip_url }}">Download <strong>ZIP File</strong></a></li>
<li><a href="{{ site.github.tar_url }}">Download <strong>TAR Ball</strong></a></li>
<li><a href="{{ site.github.repository_url }}">View On <strong>GitHub</strong></a></li>
</ul>
{% endif %}
</header>
<section>
{{ content }}
</section>
<footer>
{% if site.github.is_project_page %}
<p>This project is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
{% endif %}
<p><small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p>
</footer>
</div>
<script src="{{ "/assets/js/scale.fix.js" | relative_url }}"></script>
{% if site.google_analytics %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}
</body>
</html>

0
android-chrome-192x192.png → dist/icons/android-chrome-192x192.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
apple-touch-icon.png → dist/icons/apple-touch-icon.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

2
dist/icons/browserconfig.xml vendored
View File

@ -2,7 +2,7 @@
<browserconfig> <browserconfig>
<msapplication> <msapplication>
<tile> <tile>
<square150x150logo src="/mstile-150x150.png"/> <square150x150logo src="/dist/icons/mstile-150x150.png"/>
<TileColor>#b91d47</TileColor> <TileColor>#b91d47</TileColor>
</tile> </tile>
</msapplication> </msapplication>

0
favicon-16x16.png → dist/icons/favicon-16x16.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
favicon-32x32.png → dist/icons/favicon-32x32.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
favicon.png → dist/icons/favicon.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
dist/icons/site.webmanifest vendored
View File

@ -3,7 +3,7 @@
"short_name": "RaspAP", "short_name": "RaspAP",
"icons": [ "icons": [
{ {
"src": "/android-chrome-192x192.png", "src": "/dist/icons/android-chrome-192x192.png",
"sizes": "192x192", "sizes": "192x192",
"type": "image/png" "type": "image/png"
} }

14
index.php
View File

@ -91,12 +91,14 @@ $theme_url = 'dist/css/'.htmlspecialchars($theme, ENT_QUOTES);
<!-- Custom CSS --> <!-- Custom CSS -->
<link href="<?php echo $theme_url; ?>" title="main" rel="stylesheet"> <link href="<?php echo $theme_url; ?>" title="main" rel="stylesheet">
<link rel="shortcut icon" type="image/png" href="/favicon.png?ver=2.0"> <link rel="shortcut icon" type="image/png" href="/dist/icons/favicon.png?ver=2.0">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="/dist/icons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="/dist/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="/dist/icons/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest"> <link rel="icon" type="image/png" href="/dist/icons/favicon.png" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"> <link rel="manifest" href="/dist/icons/site.webmanifest">
<link rel="mask-icon" href="/dist/icons/safari-pinned-tab.svg" color="#b91d47">
<meta name="msapplication-config" content="/dist/icons/browserconfig.xml">
<meta name="msapplication-TileColor" content="#b91d47"> <meta name="msapplication-TileColor" content="#b91d47">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->

20
installers/common.sh
View File

@ -131,9 +131,9 @@ function create_hostapd_scripts() {
sudo mkdir $raspap_dir/hostapd || install_error "Unable to create directory '$raspap_dir/hostapd'" sudo mkdir $raspap_dir/hostapd || install_error "Unable to create directory '$raspap_dir/hostapd'"
# Move logging shell scripts # Move logging shell scripts
sudo mv "$webroot_dir/installers/"*log.sh "$raspap_dir/hostapd" || install_error "Unable to move logging scripts" sudo cp "$webroot_dir/installers/"*log.sh "$raspap_dir/hostapd" || install_error "Unable to move logging scripts"
# Move service control shell scripts # Move service control shell scripts
sudo mv "$webroot_dir/installers/"service*.sh "$raspap_dir/hostapd" || install_error "Unable to move service control scripts" sudo cp "$webroot_dir/installers/"service*.sh "$raspap_dir/hostapd" || install_error "Unable to move service control scripts"
# Make enablelog.sh and disablelog.sh not writable by www-data group. # Make enablelog.sh and disablelog.sh not writable by www-data group.
sudo chown -c root:"$raspap_user" "$raspap_dir/hostapd/"*.sh || install_error "Unable change owner and/or group." sudo chown -c root:"$raspap_user" "$raspap_dir/hostapd/"*.sh || install_error "Unable change owner and/or group."
sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions." sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions."
@ -149,10 +149,6 @@ function download_latest_files() {
install_log "Cloning latest files from github" install_log "Cloning latest files from github"
git clone --depth 1 https://github.com/billz/raspap-webgui /tmp/raspap-webgui || install_error "Unable to download files from github" git clone --depth 1 https://github.com/billz/raspap-webgui /tmp/raspap-webgui || install_error "Unable to download files from github"
sudo mv /tmp/raspap-webgui $webroot_dir || install_error "Unable to move raspap-webgui to web root" sudo mv /tmp/raspap-webgui $webroot_dir || install_error "Unable to move raspap-webgui to web root"
# Move icons to webroot
echo -n "Installing high-res favicons"
sudo mv $webroot_dir/dist/icons/* $webroot_dir || install_error "Unable to move icons to web root"
} }
# Sets files ownership in web root directory # Sets files ownership in web root directory
@ -200,7 +196,7 @@ function move_config_file() {
fi fi
install_log "Moving configuration file to '$raspap_dir'" install_log "Moving configuration file to '$raspap_dir'"
sudo mv "$webroot_dir"/raspap.php "$raspap_dir" || install_error "Unable to move files to '$raspap_dir'" sudo cp "$webroot_dir"/raspap.php "$raspap_dir" || install_error "Unable to move files to '$raspap_dir'"
sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || install_error "Unable to change file ownership for '$raspap_dir'" sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || install_error "Unable to change file ownership for '$raspap_dir'"
} }
@ -210,10 +206,10 @@ function default_configuration() {
if [ -f /etc/default/hostapd ]; then if [ -f /etc/default/hostapd ]; then
sudo mv /etc/default/hostapd /tmp/default_hostapd.old || install_error "Unable to remove old /etc/default/hostapd file" sudo mv /etc/default/hostapd /tmp/default_hostapd.old || install_error "Unable to remove old /etc/default/hostapd file"
fi fi
sudo mv $webroot_dir/config/default_hostapd /etc/default/hostapd || install_error "Unable to move hostapd defaults file" sudo cp $webroot_dir/config/default_hostapd /etc/default/hostapd || install_error "Unable to move hostapd defaults file"
sudo mv $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || install_error "Unable to move hostapd configuration file" sudo cp $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || install_error "Unable to move hostapd configuration file"
sudo mv $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file" sudo cp $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file"
sudo mv $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file" sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file"
# Generate required lines for Rasp AP to place into rc.local file. # Generate required lines for Rasp AP to place into rc.local file.
# #RASPAP is for removal script # #RASPAP is for removal script
@ -241,7 +237,7 @@ function default_configuration() {
read answer read answer
if [ "$answer" != 'n' ] && [ "$answer" != 'N' ]; then if [ "$answer" != 'n' ] && [ "$answer" != 'N' ]; then
echo -n "Enabling RaspAP daemon. Disable with: sudo systemctl disable raspap.service" echo -n "Enabling RaspAP daemon. Disable with: sudo systemctl disable raspap.service"
sudo mv $webroot_dir/installers/raspap.service /lib/systemd/system/ || install_error "Unable to move raspap.service file" sudo cp $webroot_dir/installers/raspap.service /lib/systemd/system/ || install_error "Unable to move raspap.service file"
sudo systemctl enable raspap.service || install_error "Failed to enable raspap.service" sudo systemctl enable raspap.service || install_error "Failed to enable raspap.service"
fi fi
} }