Skip to content

Commit 602c4c2

Browse files
committed
Vagrant-related changes.
- Bumped a dependency version to support Vagrant. - Tweaked Vagrant provision to not require SUDO.
1 parent f0c9963 commit 602c4c2

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

gdrivefs/resources/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ fusepy==2.0.2
55
#gevent==1.0
66
#gipc==0.4.0
77
greenlet==0.4.2
8-
httplib2>=0.8
8+
httplib2>=0.9.2
99
python-dateutil==2.2

vagrant/bootstrap.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,46 @@ apt-get install -y python-pip build-essential python-dev
1111

1212
# Install dependencies.
1313

14-
pip install ez_setup
14+
pip install -U pip
1515
pip install -r /gdrivefs/requirements.txt
1616

1717
# Add "gdrivefs" to PYTHONPATH and install executables into path.
1818

19-
cd /gdrivefs
20-
python setup.py develop
19+
pip install -e /gdrivefs
2120

2221
# Create a mountpoint.
2322
#
24-
# We can't use /mnt/gdrivefs, because, for some reason, when we unmount that in
23+
# We can't use /mnt/gdrivefs, because, for some reason, when we unmount that in
2524
# the Vagrant machine, it unmounts the shared-folder the the same name, too.
2625

2726
mkdir /mnt/g
27+
sudo chown vagrant:vagrant /mnt/g
28+
29+
# Configure us to run as non-root.
30+
31+
sudo chmod 755 /etc/fuse.conf
32+
sudo adduser vagrant fuse
2833

2934
# Get the user going with an authorization URL.
3035

3136
echo
32-
gdfstool auth -u
37+
gdfstool auth_get_url
3338

3439
# Mention follow-up steps.
3540
# *For some reason, we can't print empty strings, so we print single-spaces.
3641

3742
echo " "
3843
echo "Once you have retrieved your authorization string, run:"
3944
echo " "
40-
echo " sudo gdfstool auth -a /var/cache/gdfs.creds <auth string>"
45+
echo " gdfstool auth_write <authcode>"
4146
echo " "
4247
echo " "
4348
echo "Once authorized, you can mount by calling (as root):"
4449
echo " "
45-
echo " sudo gdfs /var/cache/gdfs.creds /mnt/g"
50+
echo " gdfs default /mnt/g"
4651
echo " "
4752
echo "Or, to debug (and disable change-monitoring, to simplify things):"
4853
echo " "
49-
echo " sudo GD_DEBUG=1 GD_MONITOR_CHANGES=0 gdfs /var/cache/gdfs.creds /mnt/g"
54+
echo " GD_DEBUG=1 GD_MONITOR_CHANGES=0 gdfs default /mnt/g"
5055
echo " "
5156
echo " "

0 commit comments

Comments
 (0)