Hotfix date confusion
This commit is contained in:
parent
969f8b2eb5
commit
dd615058c4
1 changed files with 34 additions and 33 deletions
|
|
@ -13,8 +13,9 @@ NOTIFY_NAME="Helium Helper"
|
|||
SCRIPT_NAME="$APP_NAME Launcher Updater"
|
||||
PARENT_SCRIPT_FILE_NAME="helium_helper.sh"
|
||||
SCRIPT_FILE_NAME="helium_launcher_update.sh"
|
||||
SCRIPT_VERSION="0.5.9"
|
||||
DATE=$(date)
|
||||
SCRIPT_VERSION="0.5.9.1"
|
||||
LOG_DATE=$(date)
|
||||
DATE=$(date +"%d%m%y")
|
||||
|
||||
## LOCATIONS
|
||||
TMP=/tmp/$APP_NAME
|
||||
|
|
@ -59,13 +60,13 @@ dependency_check () {
|
|||
mkdir -p $LOG_PATH
|
||||
echo "########## $APP_NAME_LONG update log ##########" >> $LOG
|
||||
echo >> $LOG
|
||||
echo "$DATE | Log created" >> $LOG
|
||||
echo "$LOG_DATE | Log created" >> $LOG
|
||||
|
||||
fi
|
||||
|
||||
if [ -f "$TMP/missingDeps" ] ; then
|
||||
MISSING=$(cat $TMP/missingDeps)
|
||||
echo "$DATE | Failed to update - missing dependencies : $MISSING" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - missing dependencies : $MISSING" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Update failed! See log for details"
|
||||
exit_clean
|
||||
|
||||
|
|
@ -73,12 +74,12 @@ dependency_check () {
|
|||
|
||||
if ! [ -d "$INSTALL_PATH" ] ; then
|
||||
mkdir -p $INSTALL_PATH
|
||||
echo "$DATE | Failed to update - $APP_NAME installation path not present - But created for logging" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - $APP_NAME installation path not present - But created for logging" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Update failed! See log for details"
|
||||
exit
|
||||
|
||||
elif ! [ -f "$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" ] ; then
|
||||
echo "$DATE | Failed to update - Local $APP_NAME AppImage not found" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - Local $APP_NAME AppImage not found" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Update failed! See log for details"
|
||||
exit
|
||||
|
||||
|
|
@ -125,47 +126,47 @@ backup_helium() {
|
|||
fi
|
||||
|
||||
if [ "$BACKUP_COMPRESSION" == "pbzip2" ] ; then
|
||||
tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1
|
||||
pbzip2 $APP_NAME.backup_$DATE.tar
|
||||
tar -cf $APP_NAME.auto_backup_$DATE.tar * > /dev/null 2>&1
|
||||
pbzip2 $APP_NAME.auto_backup_$DATE.tar
|
||||
mkdir -p $BACKUP_PATH
|
||||
mv $APP_NAME.backup_$DATE.tar.bz2 $BACKUP_PATH
|
||||
mv $APP_NAME.auto_backup_$DATE.tar.bz2 $BACKUP_PATH
|
||||
cd $TMP && rm -rf backup
|
||||
|
||||
elif [ "$BACKUP_COMPRESSION" == "gzip" ] ; then
|
||||
tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1
|
||||
gzip $APP_NAME.backup_$DATE.tar
|
||||
tar -cf $APP_NAME.auto_backup_$DATE.tar * > /dev/null 2>&1
|
||||
gzip $APP_NAME.auto_backup_$DATE.tar
|
||||
mkdir -p $BACKUP_PATH
|
||||
mv $APP_NAME.backup_$DATE.tar.gz $BACKUP_PATH
|
||||
mv $APP_NAME.auto_backup_$DATE.tar.gz $BACKUP_PATH
|
||||
cd $TMP && rm -rf backup
|
||||
|
||||
elif [ "$BACKUP_COMPRESSION" == "bzip2" ] ; then
|
||||
tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1
|
||||
bzip2 $APP_NAME.backup_$DATE.tar
|
||||
tar -cf $APP_NAME.auto_backup_$DATE.tar * > /dev/null 2>&1
|
||||
bzip2 $APP_NAME.auto_backup_$DATE.tar
|
||||
mkdir -p $BACKUP_PATH
|
||||
mv $APP_NAME.backup_$DATE.tar.bz2 $BACKUP_PATH
|
||||
mv $APP_NAME.auto_backup_$DATE.tar.bz2 $BACKUP_PATH
|
||||
cd $TMP && rm -rf backup
|
||||
|
||||
elif [ "$BACKUP_COMPRESSION" == "zip" ] ; then
|
||||
tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1
|
||||
zip -r $APP_NAME.backup_$DATE.tar.zip $APP_NAME.backup_$DATE.tar > /dev/null 2>&1
|
||||
tar -cf $APP_NAME.auto_backup_$DATE.tar * > /dev/null 2>&1
|
||||
zip -r $APP_NAME.auto_backup_$DATE.tar.zip $APP_NAME.auto_backup_$DATE.tar > /dev/null 2>&1
|
||||
mkdir -p $BACKUP_PATH
|
||||
mv $APP_NAME.backup_$DATE.tar.zip $BACKUP_PATH
|
||||
mv $APP_NAME.auto_backup_$DATE.tar.zip $BACKUP_PATH
|
||||
cd $TMP && rm -rf backup
|
||||
|
||||
else
|
||||
echo "$DATE | Backup - Backup (uncompressed) written to $BACKUP_PATH" >> $LOG
|
||||
echo "$LOG_DATE | Backup - Backup (uncompressed) written to $BACKUP_PATH" >> $LOG
|
||||
mkdir -p $BACKUP_PATH
|
||||
mv $TMP/backup $BACKUP_PATH/$APP_NAME.backup_$DATE
|
||||
mv $TMP/backup $BACKUP_PATH/$APP_NAME.auto_backup_$DATE
|
||||
cd $TMP && rm -rf backup
|
||||
fi
|
||||
|
||||
echo "$DATE | Backup - Backup (compressed $BACKUP_COMPRESSION archive) written to $BACKUP_PATH" >> $LOG
|
||||
echo "$LOG_DATE | Backup - Backup (compressed $BACKUP_COMPRESSION archive) written to $BACKUP_PATH" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Backup created"
|
||||
cd $CWD
|
||||
fi
|
||||
|
||||
else
|
||||
echo "$DATE | Failed to backup - Nothing worth backing up found" >> $LOG
|
||||
echo "$LOG_DATE | Failed to backup - Nothing worth backing up found" >> $LOG
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -173,7 +174,7 @@ backup_helium() {
|
|||
update_script() {
|
||||
### CHECK FOR LOCAL SCRIPT
|
||||
if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then
|
||||
echo "$DATE | Failed to update script - local file not found" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update script - local file not found" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Script update failed! See log for details"
|
||||
exit
|
||||
|
||||
|
|
@ -183,12 +184,12 @@ update_script() {
|
|||
|
||||
### CHECK FOR EMPTY VERSION TAGS
|
||||
if [ -z "$SCRIPT_VERSION" ] ; then
|
||||
echo "$DATE | Failed to update script - Empty version tag --> local" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update script - Empty version tag --> local" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Script update failed! See log for details"
|
||||
exit
|
||||
|
||||
elif [ -z "$REMOTE_SCRIPT_VERSION" ] ; then
|
||||
echo "$DATE | Failed to update script - Empty version tag --> $APP_SOURCE" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update script - Empty version tag --> $APP_SOURCE" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Script update failed! See log for details"
|
||||
exit
|
||||
|
||||
|
|
@ -208,13 +209,13 @@ update_script() {
|
|||
wget -P $TMP $REMOTE_REPO_URL/$PARENT_SCRIPT_FILE_NAME -q
|
||||
chmod +x $TMP/$SCRIPT_FILE_NAME $TMP/$PARENT_SCRIPT_FILE_NAME
|
||||
mv $TMP/$SCRIPT_FILE_NAME $TMP/$PARENT_SCRIPT_FILE_NAME $SCRIPT_PATH
|
||||
echo "$DATE | Script updated to version $REMOTE_SCRIPT_VERSION" >> $LOG
|
||||
echo "$LOG_DATE | Script updated to version $REMOTE_SCRIPT_VERSION" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Script updated to version $REMOTE_SCRIPT_VERSION"
|
||||
|
||||
else
|
||||
echo "$DATE | Failed to update - Malformed version tags" >> $LOG
|
||||
echo "$DATE | Remote Version: $REMOTE_SCRIPT_VERSION" >> $LOG
|
||||
echo "$DATE | Local Version: $SCRIPT_VERSION" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - Malformed version tags" >> $LOG
|
||||
echo "$LOG_DATE | Remote Version: $REMOTE_SCRIPT_VERSION" >> $LOG
|
||||
echo "$LOG_DATE | Local Version: $SCRIPT_VERSION" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Script update failed! See log for details"
|
||||
fi
|
||||
}
|
||||
|
|
@ -228,12 +229,12 @@ update_helium() {
|
|||
|
||||
### CHECK FOR EMPTY VERSION TAGS
|
||||
if [[ -z "$APP_SOURCE_VERSION" ]] ; then
|
||||
echo "$DATE | Failed to update - Empty version tag --> $APP_SOURCE" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - Empty version tag --> $APP_SOURCE" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Browser update failed! See log for details"
|
||||
exit
|
||||
|
||||
elif [[ -z "$LOCAL_VERSION" ]] ; then
|
||||
echo "$DATE | Failed to update - Empty version tag --> LOCAL" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - Empty version tag --> LOCAL" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Browser update failed! See log for details"
|
||||
exit
|
||||
|
||||
|
|
@ -253,11 +254,11 @@ update_helium() {
|
|||
backup_helium
|
||||
mv $TMP/$APP_SOURCE_FILENAME $INSTALL_PATH/$APP_NAME.$FILE_EXTENSION
|
||||
sed -i "s|X-AppImage-Version=.*|X-AppImage-Version=$($INSTALL_PATH/$APP_NAME.$FILE_EXTENSION --version | awk '{print $2}')|" $LAUNCHER_PATH/$APP_NAME.desktop
|
||||
echo "$DATE | $APP_NAME updated to version ${APP_SOURCE_VERSION}" >> $LOG
|
||||
echo "$LOG_DATE | $APP_NAME updated to version ${APP_SOURCE_VERSION}" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Browser updated to version $APP_SOURCE_VERSION"
|
||||
|
||||
else
|
||||
echo "$DATE | Failed to update - Version tags malformed" >> $LOG
|
||||
echo "$LOG_DATE | Failed to update - Version tags malformed" >> $LOG
|
||||
notify-send --icon="$ICON" "$NOTIFY_NAME" "Browser update failed! See log for details"
|
||||
exit
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue