Fixed symlink issue

Fixed issue where if you cancelled the themes selection dialog box, it would symlink all folders of the root directory in your Worlds folder.
This commit is contained in:
Nicole George 2020-02-10 01:10:54 -06:00 committed by GitHub
parent 289d1d113d
commit 00dc0191b6

View File

@ -37,31 +37,43 @@ main() {
'Backup Worlds files') 'Backup Worlds files')
mkdir -p "$WORLDSDIR/backup" mkdir -p "$WORLDSDIR/backup"
bkup=$(zenity --file-selection --title="Select Backup folder to backup to" --directory --filename="$WORLDSDIR/backups/" --save) bkup=$(zenity --file-selection --title="Select Backup folder to backup to" --directory --filename="$WORLDSDIR/backups/" --save)
if [[ $? -eq 1 ]]; then
main
else
echo "$WORLDSINSTALL/worlds.ini >> $bkup/worlds.ini" echo "$WORLDSINSTALL/worlds.ini >> $bkup/worlds.ini"
cp -r "$WORLDSINSTALL/worlds.ini" "$bkup/worlds.ini" cp -r "$WORLDSINSTALL/worlds.ini" "$bkup/worlds.ini"
echo "$WORLDSINSTALL/gamma.avatars >> $bkup/gamma.avatars" echo "$WORLDSINSTALL/gamma.avatars >> $bkup/gamma.avatars"
cp -r "$WORLDSINSTALL/gamma.avatars" "$bkup/gamma.avatars" cp -r "$WORLDSINSTALL/gamma.avatars" "$bkup/gamma.avatars"
echo "$WORLDSINSTALL/gamma.worldsmarks >> $bkup/gamma.worldsmarks" echo "$WORLDSINSTALL/gamma.worldsmarks >> $bkup/gamma.worldsmarks"
cp -r "$WORLDSINSTALL/gamma.worldsmarks" "$bkup/gamma.worldsmarks" cp -r "$WORLDSINSTALL/gamma.worldsmarks" "$bkup/gamma.worldsmarks"
main ;; main
fi ;;
'Restore last backup') 'Restore last backup')
mkdir -p "$WORLDSDIR/backup" mkdir -p "$WORLDSDIR/backup"
rbkup=$(zenity --file-selection --title="Select Backup folder to restore from" --directory --filename="$WORLDSDIR/backups/") rbkup=$(zenity --file-selection --title="Select Backup folder to restore from" --directory --filename="$WORLDSDIR/backups/")
if [[ $? -eq 1 ]]; then
main
else
echo "$rbkup/worlds.ini >> $WORLDSINSTALL/worlds.ini" echo "$rbkup/worlds.ini >> $WORLDSINSTALL/worlds.ini"
cp -r "$rbkup/worlds.ini" "$WORLDSINSTALL/worlds.ini" cp -r "$rbkup/worlds.ini" "$WORLDSINSTALL/worlds.ini"
echo "$rbkup/gamma.avatars >> $WORLDSINSTALL/gamma.avatars" echo "$rbkup/gamma.avatars >> $WORLDSINSTALL/gamma.avatars"
cp -r "$rbkup/gamma.avatars" "$WORLDSINSTALL/gamma.avatars" cp -r "$rbkup/gamma.avatars" "$WORLDSINSTALL/gamma.avatars"
echo "$rbkup/gamma.worldsmarks >> $WORLDSINSTALL/gamma.worldsmarks" echo "$rbkup/gamma.worldsmarks >> $WORLDSINSTALL/gamma.worldsmarks"
cp -r "$rbkup/gamma.worldsmarks" "$WORLDSINSTALL/gamma.worldsmarks" cp -r "$rbkup/gamma.worldsmarks" "$WORLDSINSTALL/gamma.worldsmarks"
main ;; main
fi ;;
'Set theme' ) 'Set theme' )
seltheme=$(zenity --file-selection --title="Select a theme folder" --directory --filename="$WORLDSDIR/themes/") seltheme=$(zenity --file-selection --title="Select a theme folder" --directory --filename="$WORLDSDIR/themes/")
if [[ $? -eq 1 ]]; then
main
else
for i in $seltheme/*; for i in $seltheme/*;
do FILENAME="$(basename $i)" do FILENAME="$(basename $i)"
echo "$seltheme/$FILENAME >> $WORLDSINSTALL/$FILENAME" echo "$seltheme/$FILENAME >> $WORLDSINSTALL/$FILENAME"
ln -sf "$seltheme/$FILENAME" "$WORLDSINSTALL/$FILENAME" ln -sf "$seltheme/$FILENAME" "$WORLDSINSTALL/$FILENAME"
done done
main ;; main
fi ;;
'Clear Cache') 'Clear Cache')
rm -rf "$WORLDSINSTALL/cachedir" rm -rf "$WORLDSINSTALL/cachedir"
main ;; main ;;