remote pool_handle_t

[tlspool] / QUICKSTART.sh

diff --git a/QUICKSTART.sh b/QUICKSTART.sh
index dc3021d..58e520a 100755 (executable)
--- a/QUICKSTART.sh
+++ b/QUICKSTART.sh
@@ -46,7 +46,7 @@ else
 fi
 
 if [ -z "$2" ]; then
-  WORKINGDIR="$(date '+%Y-%m-%d')-tlspool-environment";
+  WORKINGDIR="$(date --iso-8601)-tlspool-environment"; 
 else
   y="$2"
   WORKINGDIR=${y##*/};
@@ -80,26 +80,20 @@ cd "$BASEDIR/$WORKINGDIR"
 # tlspool with a simple "git pull" from the main repository and nix-build command.
 
 if [ ! -d "tlspool" ]; then
-  git clone https://github.com/amarsman/tlspool
-  cd tlspool
-  git checkout tlspool-gui
-  cd ..
+  git clone https://github.com/arpa2/tlspool
+  git checkout 49bf1157e3471ee15bc279d41c9492646a2bf44c
 else
   cd tlspool
-  git checkout tlspool-gui
-  git pull https://github.com/amarsman/tlspool
+  git pull https://github.com/arpa2/tlspool
+  git checkout 49bf1157e3471ee15bc279d41c9492646a2bf44c
   cd ..
 fi
 
 if [ ! -d "nixpkgs" ]; then
-  git clone https://github.com/amarsman/nixpkgs
-  cd nixpkgs
-  git checkout tlspool-gui
-  cd ..
+  git clone https://github.com/arpa2/nixpkgs
 else
   cd nixpkgs
-  git checkout tlspool-gui
-  git pull https://github.com/amarsman/nixpkgs
+  git pull https://github.com/arpa2/nixpkgs
   cd ..
 fi
 
@@ -111,24 +105,15 @@ else
   cd ..
 fi
 
-if [ ! -d "tlspool-gui" ]; then
-  git clone https://github.com/amarsman/tlspool-gui
-else
-  cd steamworks 
-  git pull https://github.com/amarsman/tlspool-gui
-  cd ..
-fi
-
 # Go into the nixpkgs folder and switch to the tlspool branch:
 
 cd nixpkgs
 export NIXPKGS="$BASEDIR/$WORKINGDIR/nixpkgs"
-git checkout tlspool-gui
+git checkout tlspool
 
 # Install tlspool and all the dependencies through nix:
 
 nix-env -f "$NIXPKGS" -iA tlspool
-nix-env -f "$NIXPKGS" -iA tlspool-gui
 
 cd ..
 
@@ -168,7 +153,7 @@ then
     fi
     # Create the config file and check wether it was created.
     printf "$LINE1a$BASEDIR/$WORKINGDIR/token\n$LINE2\n$LINE3\n" >> "$CONFIGFILE"
-    if [ -e "$CONFIGFILE" ]; then 
+    if [ -a "$CONFIGFILE" ]; then 
       printf "\nSoftHSMv2 configuration file $CONFIGFILE created.\n"
     fi
     # Now, given that there was no config, surely there will not be a token. 
@@ -201,4 +186,4 @@ fi
 printf "A simple git pull will update either.\n\nOr just copy $UPDATESCRIPT to wherever you want it to be.\n\n"
 
 printf "You can run 'tlspool -c configfile'. There is an example config file at "
-printf "~/.nix-profile/etc/tlspool/tlspool.conf which you can modify for usage." 
+printf "~i/.nix-profile/etc/tlspool/tlspool.conf which you can modify for usage."