summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.rst2
-rw-r--r--reinstall-recovery/recovery.sh15
-rwxr-xr-xupdate-tool/cronjob-for-check-updates.sh2
3 files changed, 17 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index 01bec66..01dff24 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ What it contains
----------------
Custom applications for FOSSEE-OS.
-[http://netbook.fossee.in]
+[http://laptop.fossee.in]
These tools are essentially simple bash scripts using zenity/dialog/easybashgui/notify-send
for UI interactions.
diff --git a/reinstall-recovery/recovery.sh b/reinstall-recovery/recovery.sh
index 3934a42..03aa2dd 100644
--- a/reinstall-recovery/recovery.sh
+++ b/reinstall-recovery/recovery.sh
@@ -123,6 +123,20 @@ installation()
umount $ubuntu_dir
# /bin/sh
+<<<<<<< HEAD
+ echo ""
+ echo -e "\t\tInstallation complete."
+ sleep 2
+ echo ""
+ #umount /dev/mmcblk0p1
+ printf "\t\tPress ENTER to restart.[ Please remove the SD card first ]"
+ read read_restart
+ if $read_restart; then
+ reboot
+ else
+ echo "It shouldn't come here"
+ fi
+=======
echo ""
echo -e "\t\tInstallation complete."
sleep 2
@@ -136,6 +150,7 @@ installation()
echo "It shouldn't come here"
fi
+>>>>>>> backup-gui
}
#This functions presents the user with advanecd options where he/she can backup their data from previous installation or repair the current installation through shell prompt.
diff --git a/update-tool/cronjob-for-check-updates.sh b/update-tool/cronjob-for-check-updates.sh
index 53d5e85..eaf2c3a 100755
--- a/update-tool/cronjob-for-check-updates.sh
+++ b/update-tool/cronjob-for-check-updates.sh
@@ -15,7 +15,7 @@ return_text=$(git fetch --tags --dry-run 2>&1)
# Check for return code, it will be 0 if internet is available
[ $? -eq 0 ] && [ $(echo $return_text|wc -l) -ge 1 ] && \
-sudo -u $user /usr/bin/notify-send -i "path/to//opt/FOSSEE-netbook-tools/update-tool/patcher.png" \
+sudo -u $user /usr/bin/notify-send -i "/opt/FOSSEE-netbook-tools/update-tool/patcher.png" \
"FOSSEE Updates available" \
"menu -> FOSSEE-Tools -> FOSSEE-updates"