Updated install script

packages/curl/curl.c

@@ -75,7 +75,6 @@ static int CurlInfoTypes[58] = {
     CURLINFO_LOCAL_PORT,
     CURLINFO_HTTP_VERSION,
     CURLINFO_PROXY_SSL_VERIFYRESULT,
-    CURLINFO_PROTOCOL,
     CURLINFO_SCHEME,
     CURLINFO_TOTAL_TIME_T,
     CURLINFO_NAMELOOKUP_TIME_T,
@@ -131,7 +130,6 @@ struct CURLInfoTypeMap {
     [CURLINFO_LOCAL_PORT] = { CURLINFO_LONG },
     [CURLINFO_HTTP_VERSION] = { CURLINFO_LONG },
     [CURLINFO_PROXY_SSL_VERIFYRESULT] = { CURLINFO_LONG },
-    [CURLINFO_PROTOCOL] = { CURLINFO_LONG },
     [CURLINFO_SCHEME] = { CURLINFO_STRING },
     [CURLINFO_TOTAL_TIME_T] = { CURLINFO_OFF_T },
     [CURLINFO_NAMELOOKUP_TIME_T] = { CURLINFO_OFF_T  },
@@ -170,7 +168,6 @@ DEFINE_CURL_CONSTANT(CURLOPT_LOW_SPEED_TIME)
 DEFINE_CURL_CONSTANT(CURLOPT_RESUME_FROM)
 DEFINE_CURL_CONSTANT(CURLOPT_COOKIE)
 DEFINE_CURL_CONSTANT(CURLOPT_HTTPHEADER)
-DEFINE_CURL_CONSTANT(CURLOPT_HTTPPOST)
 DEFINE_CURL_CONSTANT(CURLOPT_SSLCERT)
 DEFINE_CURL_CONSTANT(CURLOPT_KEYPASSWD)
 DEFINE_CURL_CONSTANT(CURLOPT_CRLF)
@@ -196,7 +193,6 @@ DEFINE_CURL_CONSTANT(CURLOPT_APPEND)
 DEFINE_CURL_CONSTANT(CURLOPT_NETRC)
 DEFINE_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION)
 DEFINE_CURL_CONSTANT(CURLOPT_TRANSFERTEXT)
-DEFINE_CURL_CONSTANT(CURLOPT_PUT)
 DEFINE_CURL_CONSTANT(CURLOPT_AUTOREFERER)
 DEFINE_CURL_CONSTANT(CURLOPT_PROXYPORT)
 DEFINE_CURL_CONSTANT(CURLOPT_POSTFIELDSIZE)
@@ -211,8 +207,6 @@ DEFINE_CURL_CONSTANT(CURLOPT_TELNETOPTIONS)
 DEFINE_CURL_CONSTANT(CURLOPT_MAXCONNECTS)
 DEFINE_CURL_CONSTANT(CURLOPT_FRESH_CONNECT)
 DEFINE_CURL_CONSTANT(CURLOPT_FORBID_REUSE)
-DEFINE_CURL_CONSTANT(CURLOPT_RANDOM_FILE)
-DEFINE_CURL_CONSTANT(CURLOPT_EGDSOCKET)
 DEFINE_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT)
 DEFINE_CURL_CONSTANT(CURLOPT_HTTPGET)
 DEFINE_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST)
@@ -429,7 +423,6 @@ DEFINE_CURL_CONSTANT(CURLINFO_LOCAL_IP)
 DEFINE_CURL_CONSTANT(CURLINFO_LOCAL_PORT)
 DEFINE_CURL_CONSTANT(CURLINFO_HTTP_VERSION)
 DEFINE_CURL_CONSTANT(CURLINFO_PROXY_SSL_VERIFYRESULT)
-DEFINE_CURL_CONSTANT(CURLINFO_PROTOCOL)
 DEFINE_CURL_CONSTANT(CURLINFO_SCHEME)
 DEFINE_CURL_CONSTANT(CURLINFO_TOTAL_TIME_T)
 DEFINE_CURL_CONSTANT(CURLINFO_NAMELOOKUP_TIME_T)
@@ -995,7 +988,6 @@ CREATE_MODULE_LOADER(curl) {
       GET_CURL_CONSTANT(CURLOPT_RESUME_FROM),
       GET_CURL_CONSTANT(CURLOPT_COOKIE),
       GET_CURL_CONSTANT(CURLOPT_HTTPHEADER),
-      GET_CURL_CONSTANT(CURLOPT_HTTPPOST),
       GET_CURL_CONSTANT(CURLOPT_SSLCERT),
       GET_CURL_CONSTANT(CURLOPT_KEYPASSWD),
       GET_CURL_CONSTANT(CURLOPT_CRLF),
@@ -1021,7 +1013,6 @@ CREATE_MODULE_LOADER(curl) {
       GET_CURL_CONSTANT(CURLOPT_NETRC),
       GET_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION),
       GET_CURL_CONSTANT(CURLOPT_TRANSFERTEXT),
-      GET_CURL_CONSTANT(CURLOPT_PUT),
       GET_CURL_CONSTANT(CURLOPT_AUTOREFERER),
       GET_CURL_CONSTANT(CURLOPT_PROXYPORT),
       GET_CURL_CONSTANT(CURLOPT_POSTFIELDSIZE),
@@ -1036,8 +1027,6 @@ CREATE_MODULE_LOADER(curl) {
       GET_CURL_CONSTANT(CURLOPT_MAXCONNECTS),
       GET_CURL_CONSTANT(CURLOPT_FRESH_CONNECT),
       GET_CURL_CONSTANT(CURLOPT_FORBID_REUSE),
-      GET_CURL_CONSTANT(CURLOPT_RANDOM_FILE),
-      GET_CURL_CONSTANT(CURLOPT_EGDSOCKET),
       GET_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT),
       GET_CURL_CONSTANT(CURLOPT_HTTPGET),
       GET_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST),
@@ -1254,7 +1243,6 @@ CREATE_MODULE_LOADER(curl) {
       GET_CURL_CONSTANT(CURLINFO_LOCAL_PORT),
       GET_CURL_CONSTANT(CURLINFO_HTTP_VERSION),
       GET_CURL_CONSTANT(CURLINFO_PROXY_SSL_VERIFYRESULT),
-      GET_CURL_CONSTANT(CURLINFO_PROTOCOL),
       GET_CURL_CONSTANT(CURLINFO_SCHEME),
       GET_CURL_CONSTANT(CURLINFO_TOTAL_TIME_T),
       GET_CURL_CONSTANT(CURLINFO_NAMELOOKUP_TIME_T),

packages/curl/curl/infos.b

@@ -334,7 +334,7 @@ class Info {
    * The protocol used in the last request.
    * @static
    */
-  static var PROTOCOL = _curl.CURLINFO_PROTOCOL
+  static var PROTOCOL = _curl.CURLINFO_SCHEME
 
   /**
    * A string holding the URL scheme used for the most recent connection done with 

packages/curl/curl/options.b

@@ -133,7 +133,7 @@ class Option {
     * This points to a linked list of post entries. 
     * @static
     */
-   static var HTTPPOST = _curl.CURLOPT_HTTPPOST
+   static var HTTPPOST = _curl.CURLOPT_MIMEPOST
 
    /**
     * name of the file keeping your private SSL-certificate 
@@ -283,7 +283,7 @@ class Option {
     * HTTP PUT 
     * @static
     */
-   static var PUT = _curl.CURLOPT_PUT
+   static var PUT = _curl.CURLOPT_UPLOAD
 
    /**
     * We want the referrer field set automatically when following locations 
@@ -378,19 +378,6 @@ class Option {
     */
    static var FORBID_REUSE = _curl.CURLOPT_FORBID_REUSE
 
-   /**
-    * Set to a file name that contains random data for libcurl to use to
-    * seed the random engine when doing SSL connects. 
-    * @static
-    */
-   static var RANDOM_FILE = _curl.CURLOPT_RANDOM_FILE
-
-   /**
-    * Set to the Entropy Gathering Daemon socket pathname 
-    * @static
-    */
-   static var EGDSOCKET = _curl.CURLOPT_EGDSOCKET
-
    /**
     * Time-out connect operations after this amount of seconds, if connects are
     * OK within this time, then fine... This only aborts the connect phase. 

scripts/install.sh

@@ -16,11 +16,11 @@ then
 fi
 
 if [ "/usr/bin/zsh" == "$SHELL" ]; then
-  PROFILE_FILE="$USER/.zshrc"
+  PROFILE_FILE="$HOME/.zshrc"
 elif [ "/usr/bin/bash" == "$SHELL" ]; then
-  PROFILE_FILE="$USER/.bashrc"
+  PROFILE_FILE="$HOME/.bashrc"
 else
-  PROFILE_FILE="$USER/.profile"
+  PROFILE_FILE="$HOME/.profile"
 fi
 
 # Check OS.