Skip to content

Commit

Permalink
Merge pull request #35 from germanztz/v47
Browse files Browse the repository at this point in the history
V47
  • Loading branch information
germanztz authored Oct 26, 2024
2 parents 2f976cf + 1b4222c commit f39539a
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 31 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ Zoho WorkDrive| The local filesystem

# ChangeLog

## v47.0

- [x] Shell 47 version update
- [x] Bug fix, extension crash on startup if not rclone installed

## v46.0

- [x] Shell 46 version update
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Vagrant.configure("2") do |config|
# https://docs.vagrantup.com.

# config.vagrant.plugins = ["vagrant-reload"]
config.vm.box = "daimler/ubuntu-24.04-desktop"
config.vm.box = "daimler/ubuntu-24.10-desktop-amd64"


# Share an additional folder to the guest VM. The first argument is
Expand Down
9 changes: 1 addition & 8 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@ const RcloneManagerIndicator = GObject.registerClass(
hbox.add_child(this.icon)
this.add_child(hbox)

let item = new PopupMenu.PopupMenuItem(_('Show Notification'));
item.connect('activate', () => {
Main.notify(_('Whatʼs up, folks?'));
log('Whatʼs up, folks?')
});
this.menu.addMenuItem(item);

this._loadSettings()
this._checkDependencies()
this._initConfig()
Expand Down Expand Up @@ -99,7 +92,7 @@ const RcloneManagerIndicator = GObject.registerClass(
if (!rcVersion || !rcVersion.includes('rclone')) {
log('rcm._checkDependencies ERROR: It seems you don\'t have rclone installed, this extension won\'t work without it')
const subTitle = _('rclone Version: ') + rcVersion
const message = _("It seems you don't have rclone installed, this extension won't work without it")
const message = "It seems you don\'t have rclone installed, this extension won\'t work without it"
this._showNotification(`${this.extension.metadata.name} ${_('Error')} ${_('rclone Version: ')}`, `${message} ${subTitle}`)
this.icon.icon_name = PROFILE_ERROR_ICON
return false
Expand Down
11 changes: 8 additions & 3 deletions fileMonitorHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,14 @@ export class FileMonitorHelper {
}

getRcVersion() {
const [exitStatus, stdout] = this.spawnSync(this.RC_VERSION.split(' '))
this.PREF_DBG && log('fmh.rclone version', stdout, 'exitStatus', exitStatus)
return exitStatus === 0 ? stdout : undefined
try {
const [exitStatus, stdout] = this.spawnSync(this.RC_VERSION.split(' '))
this.PREF_DBG && log('fmh.rclone version', stdout, 'exitStatus', exitStatus)
return exitStatus === 0 ? stdout : undefined

} catch (e) {
return undefined
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"shell-version": [
"46"
"47"
],
"uuid": "[email protected]",
"name": "rclone-manager",
"description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one",
"url": "https://github.com/germanztz/gnome-shell-extension-rclone-manager",
"version": 46.0,
"version": 47.0,
"gettext-domain": "rclone-manager",
"settings-schema": "org.gnome.shell.extensions.rclone-manager"
}
42 changes: 25 additions & 17 deletions vm/createbox.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash
#-eux

vm_name="ubuntu-24.04-desktop"
vm_name="ubuntu-24.10-desktop-amd64"

old() {
vboxmanage() {

# Name of the new virtual machine

# Location of the ISO file
iso_file="$HOME/Descargas/ubuntu-23.10.1-desktop-amd64.iso"
iso_file="$HOME/Descargas/ubuntu-24.10-desktop-amd64.iso"

# Location to store virtual machine files
vm_folder="$HOME/VirtualBox VMs"
Expand Down Expand Up @@ -38,20 +38,28 @@ old() {
# --locale=en_US --country=US --time-zone=UTC --hostname=$vm_name --iso=$iso_file --package-selection-adjustment=minimal

# Start the virtual machine
# VBoxManage startvm $vm_name
VBoxManage startvm $vm_name

}
packer() {
yes | vboxmanage unregistervm $vm_name --delete
rm -Rf output-virtualbox-iso
packer build -force Packerfile.json
vboxmanage import output-virtualbox-iso/$vm_name.ovf

}

vagrant() {
rm $vm_name.box
vagrant package --base $vm_name --output $vm_name.box
vagrant box remove daimler/$vm_name -f
vagrant box add --name daimler/$vm_name $vm_name.box
vagrant destroy -f
rm Vagrantfile
vagrant init daimler/$vm_name
vagrant up
}

#ejecutar función invocada por parámetro

#yes | vboxmanage unregistervm $vm_name --delete
#rm -Rf output-virtualbox-iso
#packer build -force Packerfile.json
#vboxmanage import output-virtualbox-iso/$vm_name.ovf

rm $vm_name.box
vagrant package --base $vm_name --output $vm_name.box
vagrant box remove daimler/$vm_name -f
vagrant box add --name daimler/$vm_name $vm_name.box
vagrant destroy -f
rm Vagrantfile
vagrant init daimler/$vm_name
vagrant up
$1 ;

0 comments on commit f39539a

Please sign in to comment.