Skip to content

Fix syntax errors and improve installation script robustness #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RahulDev-01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix syntax errors and improve installation script robustness #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ done

printf -v LG_FRAMES "%s " "${array[@]}"

if [ $INSTALL_DRIVERS_CHAR == "y" ] || [$INSTALL_DRIVERS_CHAR == "Y" ] ; then
if [ $INSTALL_DRIVERS_CHAR == "y" ] || [ $INSTALL_DRIVERS_CHAR == "Y" ] ; then

INSTALL_DRIVERS=true

Expand Down Expand Up @@ -214,15 +214,15 @@ if [ $INSTALL_DRIVERS == true ] ; then

sudo apt-get install -yq libfontconfig1:i386 libx11-6:i386 libxrender1:i386 libxext6:i386 libglu1-mesa:i386 libglib2.0-0:i386 libsm6:i386

sudo apt-get install nvidia-361
sudo apt-get install -y nvidia-361

fi

echo "Installing Google Earth..."

wget -q $EARTH_DEB

sudo dpkg -i google-earth*.deb
sudo dpkg -i google-earth*.deb || sudo apt-get install -f -y
rm google-earth*.deb

# OS config tweaks (like disabling idling, hiding launcher bar, ...)
Expand All @@ -234,7 +234,7 @@ autologin-user=$LOCAL_USER
autologin-user-timeout=0
autologin-session=ubuntu
EOM
echo autologin-user=lg >> sudo /etc/lightdm/lightdm.conf
echo autologin-user=lg | sudo tee -a /etc/lightdm/lightdm.conf > /dev/null
gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
gsettings set org.gnome.desktop.session idle-delay 0
gsettings set org.gnome.desktop.screensaver lock-enabled false
Expand Down Expand Up @@ -269,14 +269,13 @@ fi

sudo cp -r $USER_PATH/gnu_linux/home/lg/. $HOME

for file in *; do

sudo mv "$HOME/dotfiles/$file" "$HOME/dotfiles/.$file"

for file in $HOME/dotfiles/*; do
if [ -f "$file" ]; then
filename=$(basename "$file")
sudo mv "$file" "$HOME/dotfiles/.$filename"
fi
done

sudo cp -r . $HOME

cd - > /dev/null

sudo cp -r $USER_PATH/gnu_linux/etc/ $USER_PATH/gnu_linux/patches/ $USER_PATH/gnu_linux/sbin/ /
Expand Down
18 changes: 12 additions & 6 deletions php-interface/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
if ($handle) {
while (!feof($handle)) {
$buffer = fgets($handle);
if (substr_count($buffer, $delimiter) == 2) {
if ($buffer && substr_count($buffer, $delimiter) == 2) {
list($planet, $name, $query) = explode($delimiter, $buffer);
$planet = explode('/', $planet)[0]; // tmp subcategories
$queries[$planet][] = array(trim($name), trim($query));
if (isset($queries[$planet])) {
$queries[$planet][] = array(trim($name), trim($query));
}
}
}
fclose($handle);
Expand All @@ -39,9 +41,14 @@
$kml_files = array('earth' => array(), 'moon' => array(), 'mars' => array(), 'layers' => array());
foreach (array_keys($kml_files) as $planet) {
$planet_kml_path = $KML_SYS_PATH . $planet . "/" . $FILE_FILTER;
foreach (glob($planet_kml_path) as $file) {
$basename = str_replace('_', ' ', explode('.', basename($file)));
$kml_files[$planet][$basename[0]] = str_replace($KML_SYS_PATH, $KML_SERVER_BASE, $file);
$files = glob($planet_kml_path);
if ($files !== false) {
foreach ($files as $file) {
$basename = str_replace('_', ' ', explode('.', basename($file)));
if (isset($basename[0])) {
$kml_files[$planet][$basename[0]] = str_replace($KML_SYS_PATH, $KML_SERVER_BASE, $file);
}
}
}
}

Expand Down Expand Up @@ -153,7 +160,6 @@ function clearKmls() {
<?php ++$i; } ?>
</ul>
</div>
</ul>
</div>

<div id="categories" class="row">
Expand Down