From acabffdd2c0d25fc7284200602136ab750a70a08 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Fri, 27 Feb 2009 15:40:24 +0000
Subject: [PATCH 01/12] Initial directory structure.

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@1 f2a461e8-04e4-11de-bcc6-d9108be23e13

From c3ae41fc7b5e19925a7f908c1b6bef186d56e3a2 Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Fri, 27 Feb 2009 15:57:11 +0000
Subject: [PATCH 02/12] Initial import

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@2 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg          | 454 +++++++++++++++++++++++++++++++++++++++++++++++
 svn-commit.2.tmp |   4 +
 svn-commit.tmp   |   4 +
 3 files changed, 462 insertions(+)
 create mode 100644 apt-cyg
 create mode 100644 svn-commit.2.tmp
 create mode 100644 svn-commit.tmp

diff --git a/apt-cyg b/apt-cyg
new file mode 100644
index 0000000..8d02f0e
--- /dev/null
+++ b/apt-cyg
@@ -0,0 +1,454 @@
+#!/bin/bash
+
+# apt-cyg: install tool for cygwin similar to debian apt-get
+# 
+# Copyright (C) 2005-9, Stephen Jungels
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# (http://www.fsf.org/licensing/licenses/gpl.html)
+
+# this script requires some packages
+
+WGET=`which wget 2> /dev/null`
+BZIP2=`which bzip2 2> /dev/null`
+TAR=`which tar 2> /dev/null`
+GAWK=`which awk 2> /dev/null`
+if test "-$WGET-" = "--" || test "-$BZIP2-" = "--" || test "-$TAR-" = "--" \
+  || test "-$GAWK-" = "--"
+then
+  echo You must install wget, tar, gawk and bzip2 to use apt-cyg.
+  exit 1
+fi
+
+
+function usage()
+{
+  echo apt-cyg: Installs and removes Cygwin packages.
+  echo "  \"apt-cyg install <package names>\" to install packages"
+  echo "  \"apt-cyg remove <package names>\" to remove packages"
+  echo "  \"apt-cyg update\" to update setup.ini"
+  echo "  \"apt-cyg show\" to show installed packages"
+  echo "  \"apt-cyg find <patterns>\" to find packages matching patterns"
+  echo "  \"apt-cyg describe <patterns>\" to describe packages matching patterns"
+  echo "  \"apt-cyg packageof <commands or files>\" to locate parent packages"
+  echo "Options:"
+  echo "  --mirror, -m <url> : set mirror"
+  echo "  --cache, -c <dir>  : set cache"
+  echo "  --file, -f <file>  : read package names from file"
+  echo "  --help"
+  echo "  --version"
+}
+
+
+
+function version()
+{
+  echo "apt-cyg version 0.56"
+  echo "Written by Stephen Jungels"
+  echo ""
+  echo "Copyright (c) 2005, 2006 Stephen Jungels.  Released under the GPL."
+}
+
+
+function findworkspace()
+{
+  # default working directory and mirror
+  
+  mirror=ftp://mirror.mcs.anl.gov/pub/cygwin
+  cache=/setup
+  
+  # work wherever setup worked last, if possible
+  
+  if test -e /etc/setup/last-cache
+  then
+    tmp="`head -1 /etc/setup/last-cache`"
+    cache="`cygpath -au "$tmp"`"
+  fi
+  
+  if test -e /etc/setup/last-mirror
+  then
+    mirror="`head -1 /etc/setup/last-mirror`"
+  fi
+  mirrordir="`echo "$mirror" | sed -e "s/:/%3a/g" -e "s:/:%2f:g"`"
+  
+  echo Working directory is $cache
+  echo Mirror is $mirror
+  mkdir -p "$cache/$mirrordir"
+  cd "$cache/$mirrordir"
+}
+
+
+function getsetup() 
+{
+  touch setup.ini
+  mv setup.ini setup.ini-save
+  wget $mirror/setup.bz2
+  if test -e setup.bz2 && test $? -eq 0
+  then
+    bunzip2 setup.bz2
+    mv setup setup.ini
+    echo Updated setup.ini
+  else
+    wget $mirror/setup.ini
+    if test -e setup.ini && test $? -eq 0
+    then
+      echo Updated setup.ini
+    else
+      mv setup.ini-save setup.ini
+      echo Error updating setup.ini, reverting
+    fi
+  fi
+}
+
+
+function checkpackages()
+{
+  if test "-$packages-" = "--"
+  then
+    echo Nothing to do, exiting
+    exit 0
+  fi
+}
+
+
+# process options
+
+noscripts=0
+file=""
+dofile=0
+command=""
+filepackages=""
+packages=""
+
+while test $# -gt 0
+do
+  case "$1" in
+
+    --mirror|-m)
+      echo "$2" > /etc/setup/last-mirror
+      shift ; shift
+    ;;
+
+    --cache|-c)
+      cygpath -aw "$2" > /etc/setup/last-cache
+      shift ; shift
+    ;;
+
+    --noscripts)
+      noscripts=1
+      shift
+    ;;
+
+    --help)
+      usage
+      exit 0
+    ;;
+
+    --version)
+      version
+      exit 0
+    ;;
+
+    --file|-f)
+      if ! test "-$2-" = "--"
+      then
+        file="$2"
+        dofile=1
+        shift
+      else
+        echo 1>&2 No file name provided, ignoring $1
+      fi
+      shift
+    ;;
+
+    update|show|find|describe|packageof|install|remove)
+      if test "-$command-" = "--"
+      then
+        command=$1
+      else
+        packages="$packages $1"
+      fi
+      shift
+
+    ;;
+
+    *)
+      packages="$packages $1"
+      shift
+
+    ;;
+
+  esac
+done
+
+
+if test $dofile = 1
+then
+  if test -f "$file"
+  then
+    filepackages="$filepackages `cat "$file" | awk '{printf "%s ", $0}'`"
+  else
+    echo File $file not found, skipping
+  fi
+  packages="$packages $filepackages"
+fi
+
+
+case "$command" in
+
+  update)
+
+    findworkspace
+    getsetup
+
+  ;;
+
+
+  show)
+
+    echo 1>&2 The following packages are installed:
+    cat /etc/setup/installed.db | awk '/[^ ]+ [^ ]+ 0/ {print $1}'
+
+  ;;
+
+
+  find)
+
+    checkpackages
+    findworkspace
+    getsetup
+
+    for pkg in $packages
+    do
+      echo ""
+      echo Searching for installed packages matching $pkg:
+      awk '/[^ ]+ [^ ]+ 0/ {if ($1 ~ query) print $1}' query="$pkg" /etc/setup/installed.db
+      echo ""
+      echo Searching for installable packages matching $pkg:
+      cat setup.ini | awk -v query="$pkg" \
+        'BEGIN{RS="\n\n@ "; FS="\n"; ORS="\n"} {if ($1 ~ query) {print $1}}'
+    done
+
+  ;;
+
+
+  describe)
+
+    checkpackages
+    findworkspace
+    getsetup
+    for pkg in $packages
+    do
+      echo ""
+      cat setup.ini | awk -v query="$pkg" \
+        'BEGIN{RS="\n\n@ "; FS="\n"; ORS="\n"} {if ($1 ~ query) {print $0 "\n"}}'
+    done
+
+  ;;
+
+
+  packageof)
+
+    checkpackages
+    for pkg in $packages
+    do
+      key=`which "$pkg" 2>/dev/null | sed "s:^/::"`
+      if test "-$key-" = "--"
+      then
+        key="$pkg"
+      fi
+      for manifest in /etc/setup/*.lst.gz
+      do
+        found=`cat $manifest | gzip -d | grep -c "$key"`
+        if test $found -gt 0
+        then
+          package=`echo $manifest | sed -e "s:/etc/setup/::" -e "s/.lst.gz//"`
+          echo Found $key in the package $package
+        fi
+      done
+    done
+
+  ;;
+
+
+  install)
+
+    checkpackages
+    findworkspace
+    getsetup
+
+    for pkg in $packages
+    do
+
+    already=`grep -c "^$pkg " /etc/setup/installed.db`
+    if test $already -ge 1
+    then
+      echo Package $pkg is already installed, skipping
+      continue
+    fi
+    echo ""
+    echo Installing $pkg
+
+    # look for package and save desc file
+
+    mkdir -p "release/$pkg"
+    cat setup.ini | awk > "release/$pkg/desc" -v package="$pkg" \
+      'BEGIN{RS="\n\n@ "; FS="\n"} {if ($1 == package) {desc = $0; px++}} \
+       END {if (px == 1 && desc != "") print desc; else print "Package not found"}' 
+    
+    desc=`cat "release/$pkg/desc"`
+    if test "-$desc-" = "-Package not found-"
+    then
+      echo Package $pkg not found or ambiguous name, exiting
+      rm -r "release/$pkg"
+      exit 1
+    fi
+    echo Found package $pkg
+    
+    
+    # download and unpack the bz2 file
+    
+    # pick the latest version, which comes first
+    install=`cat "release/$pkg/desc" | awk '/install: / { print $2; exit }'` 
+    file=`basename $install`
+    cd "release/$pkg"
+    wget -nc $mirror/$install
+    
+    # check the md5
+    digest=`cat "desc" | awk '/install: / { print $4; exit }'` 
+    digactual=`md5sum $file | awk '{print $1}'`
+    if ! test $digest = $digactual
+    then
+      echo MD5 sum did not match, exiting
+      exit 1
+    fi
+    
+    echo "Unpacking..."
+    cat $file | bunzip2 | tar > "/etc/setup/$pkg.lst" xvf - -C /
+    gzip -f "/etc/setup/$pkg.lst"
+    cd ../..
+    
+    
+    # update the package database
+    
+    cat /etc/setup/installed.db | awk > /tmp/awk.$$ -v pkg="$pkg" -v bz=$file \
+      '{if (ins != 1 && pkg < $1) {print pkg " " bz " 0"; ins=1}; print $0} \
+       END{if (ins != 1) print pkg " " bz " 0"}'
+    mv /etc/setup/installed.db /etc/setup/installed.db-save
+    mv /tmp/awk.$$ /etc/setup/installed.db
+    
+    
+    # recursively install required packages
+    
+    echo > /tmp/awk.$$ '/^requires: / {s=gensub("(requires: )?([^ ]+) ?", "\\2 ", "g", $0); print s}'
+    requires=`cat "release/$pkg/desc" | awk -f /tmp/awk.$$`
+    
+    warn=0
+    if ! test "-$requires-" = "--"
+    then
+      echo Package $pkg requires the following packages, installing:
+      echo $requires
+      for package in $requires
+      do
+        already=`grep -c "^$package " /etc/setup/installed.db`
+        if test $already -ge 1
+        then
+          echo Package $package is already installed, skipping
+          continue
+        fi
+        apt-cyg --noscripts install $package
+        if ! test $? = 0 ; then warn=1; fi
+      done
+    fi
+    if ! test $warn = 0
+    then
+      echo "Warning: some required packages did not install, continuing"
+    fi
+    
+    # run all postinstall scripts
+    
+    pis=`ls /etc/postinstall/*.sh 2>/dev/null | wc -l`
+    if test $pis -gt 0 && ! test $noscripts -eq 1
+    then
+      echo Running postinstall scripts
+      for script in /etc/postinstall/*.sh
+      do
+        $script
+        mv $script $script.done
+      done
+    fi
+    
+    echo Package $pkg installed
+
+    done
+
+  ;;
+
+
+  remove)
+
+    checkpackages
+    for pkg in $packages
+    do
+
+    already=`grep -c "^$pkg " /etc/setup/installed.db`
+    if test $already = 0
+    then
+      echo Package $pkg is not installed, skipping
+      continue
+    fi
+
+    dontremove="cygwin coreutils gawk bzip2 tar wget bash"
+    for req in $dontremove
+    do
+      if test "-$pkg-" = "-$req-"
+      then
+        echo apt-cyg cannot remove package $pkg, exiting
+        exit 1
+      fi
+    done
+
+    if ! test -e "/etc/setup/$pkg.lst.gz"
+    then
+      echo Package manifest missing, cannot remove $pkg.  Exiting
+      exit 1
+    fi
+    echo Removing $pkg
+
+    # run preremove scripts
+
+    if test -e "/etc/preremove/$pkg.sh"
+    then
+      "/etc/preremove/$pkg.sh"
+      rm "/etc/preremove/$pkg.sh"
+    fi
+
+    cat "/etc/setup/$pkg.lst.gz" | gzip -d | awk '/[^\/]$/ {print "rm -f \"/" $0 "\""}' | sh
+    rm "/etc/setup/$pkg.lst.gz"
+    rm -f /etc/postinstall/$pkg.sh.done
+    cat /etc/setup/installed.db | awk > /tmp/awk.$$ -v pkg="$pkg" '{if (pkg != $1) print $0}'
+    mv /etc/setup/installed.db /etc/setup/installed.db-save
+    mv /tmp/awk.$$ /etc/setup/installed.db
+    echo Package $pkg removed
+
+    done
+
+  ;;
+
+  *)
+
+    usage
+
+  ;;
+
+esac
+
diff --git a/svn-commit.2.tmp b/svn-commit.2.tmp
new file mode 100644
index 0000000..1bcaa29
--- /dev/null
+++ b/svn-commit.2.tmp
@@ -0,0 +1,4 @@
+Initial import
+--This line, and those below, will be ignored--
+
+A    apt-cyg
diff --git a/svn-commit.tmp b/svn-commit.tmp
new file mode 100644
index 0000000..1bcaa29
--- /dev/null
+++ b/svn-commit.tmp
@@ -0,0 +1,4 @@
+Initial import
+--This line, and those below, will be ignored--
+
+A    apt-cyg

From e81c40cac2c16389b7ccf48b9d7c03c204fe884f Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Fri, 27 Feb 2009 15:59:40 +0000
Subject: [PATCH 03/12] Removed cruft

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@3 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 svn-commit.2.tmp | 4 ----
 svn-commit.tmp   | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 svn-commit.2.tmp
 delete mode 100644 svn-commit.tmp

diff --git a/svn-commit.2.tmp b/svn-commit.2.tmp
deleted file mode 100644
index 1bcaa29..0000000
--- a/svn-commit.2.tmp
+++ /dev/null
@@ -1,4 +0,0 @@
-Initial import
---This line, and those below, will be ignored--
-
-A    apt-cyg
diff --git a/svn-commit.tmp b/svn-commit.tmp
deleted file mode 100644
index 1bcaa29..0000000
--- a/svn-commit.tmp
+++ /dev/null
@@ -1,4 +0,0 @@
-Initial import
---This line, and those below, will be ignored--
-
-A    apt-cyg

From cbff7c94a100d39b45899afe7b4b865f372d4333 Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Sun, 14 Jun 2009 16:27:41 +0000
Subject: [PATCH 04/12] Accepted patch that prevents extra downloads of
 setup.bz2

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@11 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 8d02f0e..448aae7 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -89,22 +89,25 @@ function findworkspace()
 
 function getsetup() 
 {
-  touch setup.ini
-  mv setup.ini setup.ini-save
-  wget $mirror/setup.bz2
-  if test -e setup.bz2 && test $? -eq 0
+  if test "$noscripts" == "0"
   then
-    bunzip2 setup.bz2
-    mv setup setup.ini
-    echo Updated setup.ini
-  else
-    wget $mirror/setup.ini
-    if test -e setup.ini && test $? -eq 0
+    touch setup.ini
+    mv setup.ini setup.ini-save
+    wget $mirror/setup.bz2
+    if test -e setup.bz2 && test $? -eq 0
     then
+      bunzip2 setup.bz2
+      mv setup setup.ini
       echo Updated setup.ini
     else
-      mv setup.ini-save setup.ini
-      echo Error updating setup.ini, reverting
+      wget $mirror/setup.ini
+      if test -e setup.ini && test $? -eq 0
+      then
+        echo Updated setup.ini
+      else
+        mv setup.ini-save setup.ini
+        echo Error updating setup.ini, reverting
+      fi
     fi
   fi
 }

From e8891b5794501a81404c369f8874bea0791a486c Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Mon, 10 Aug 2009 14:16:43 +0000
Subject: [PATCH 05/12] Merged patch that adds --noupdate flag

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@12 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 448aae7..5263acb 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -44,6 +44,7 @@ function usage()
   echo "  --mirror, -m <url> : set mirror"
   echo "  --cache, -c <dir>  : set cache"
   echo "  --file, -f <file>  : read package names from file"
+  echo "  --noupdate, -u     : don't update setup.ini from mirror"
   echo "  --help"
   echo "  --version"
 }
@@ -52,10 +53,10 @@ function usage()
 
 function version()
 {
-  echo "apt-cyg version 0.56"
+  echo "apt-cyg version 0.57"
   echo "Written by Stephen Jungels"
   echo ""
-  echo "Copyright (c) 2005, 2006 Stephen Jungels.  Released under the GPL."
+  echo "Copyright (c) 2005-9 Stephen Jungels.  Released under the GPL."
 }
 
 
@@ -89,7 +90,7 @@ function findworkspace()
 
 function getsetup() 
 {
-  if test "$noscripts" == "0"
+  if test "$noscripts" == "0" -a "$noupdate" == "0"
   then
     touch setup.ini
     mv setup.ini setup.ini-save
@@ -126,6 +127,7 @@ function checkpackages()
 # process options
 
 noscripts=0
+noupdate=0
 file=""
 dofile=0
 command=""
@@ -151,6 +153,11 @@ do
       shift
     ;;
 
+    --noupdate|-u)
+      noupdate=1
+      shift
+    ;;
+
     --help)
       usage
       exit 0

From 25a51eb95fc9b0d08140f23ef5b8471ad3cb26f2 Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Tue, 27 Apr 2010 11:08:50 +0000
Subject: [PATCH 06/12] 1. tightened regex install expression; 2. used wget -N
 where appropriate

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@17 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 5263acb..91e5f0b 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -94,14 +94,14 @@ function getsetup()
   then
     touch setup.ini
     mv setup.ini setup.ini-save
-    wget $mirror/setup.bz2
+    wget -N $mirror/setup.bz2
     if test -e setup.bz2 && test $? -eq 0
     then
       bunzip2 setup.bz2
       mv setup setup.ini
       echo Updated setup.ini
     else
-      wget $mirror/setup.ini
+      wget -N $mirror/setup.ini
       if test -e setup.ini && test $? -eq 0
       then
         echo Updated setup.ini
@@ -328,13 +328,13 @@ case "$command" in
     # download and unpack the bz2 file
     
     # pick the latest version, which comes first
-    install=`cat "release/$pkg/desc" | awk '/install: / { print $2; exit }'` 
+    install=`cat "release/$pkg/desc" | awk '/^install: / { print $2; exit }'` 
     file=`basename $install`
     cd "release/$pkg"
     wget -nc $mirror/$install
     
     # check the md5
-    digest=`cat "desc" | awk '/install: / { print $4; exit }'` 
+    digest=`cat "desc" | awk '/^install: / { print $4; exit }'` 
     digactual=`md5sum $file | awk '{print $1}'`
     if ! test $digest = $digactual
     then

From ee3f7b84df8bb85d6e7f47364a11362e77478d39 Mon Sep 17 00:00:00 2001
From: sjungels <sjungels@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Tue, 27 Apr 2010 18:55:43 +0000
Subject: [PATCH 07/12] added edge case for obsolete packages

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@18 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 91e5f0b..23abdf6 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 
 # apt-cyg: install tool for cygwin similar to debian apt-get
@@ -323,12 +324,18 @@ case "$command" in
       exit 1
     fi
     echo Found package $pkg
-    
-    
+
     # download and unpack the bz2 file
-    
+
     # pick the latest version, which comes first
     install=`cat "release/$pkg/desc" | awk '/^install: / { print $2; exit }'` 
+
+    if test "-$install-" = "--"
+    then
+      echo "Could not find \"install\" in package description: obsolete package?"
+      exit 1
+    fi
+
     file=`basename $install`
     cd "release/$pkg"
     wget -nc $mirror/$install

From 09bf3decd71db367965bfe5a80ba8c069efa5e42 Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Mon, 17 Feb 2014 20:17:13 +0000
Subject: [PATCH 08/12] Creating version 0.58 branch

git-svn-id: https://apt-cyg.googlecode.com/svn/branches/0.58@20 f2a461e8-04e4-11de-bcc6-d9108be23e13

From 0f361a11876dd0d7b3495aa1c35dcee315db772a Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Mon, 17 Feb 2014 20:36:11 +0000
Subject: [PATCH 09/12] Detect CPU architecture for new mirror paths

git-svn-id: https://apt-cyg.googlecode.com/svn/branches/0.58@21 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 23abdf6..a75c326 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -1,6 +1,6 @@
-
 #!/bin/bash
-
+# vim: set ts=2 sw=2 tw=0 et :
+#
 # apt-cyg: install tool for cygwin similar to debian apt-get
 # 
 # Copyright (C) 2005-9, Stephen Jungels
@@ -18,7 +18,6 @@
 # (http://www.fsf.org/licensing/licenses/gpl.html)
 
 # this script requires some packages
-
 WGET=`which wget 2> /dev/null`
 BZIP2=`which bzip2 2> /dev/null`
 TAR=`which tar 2> /dev/null`
@@ -30,6 +29,7 @@ then
   exit 1
 fi
 
+[ `uname -m` == 'x86_64' ] && ARCH='x86_64' || ARCH='x86'
 
 function usage()
 {
@@ -54,7 +54,7 @@ function usage()
 
 function version()
 {
-  echo "apt-cyg version 0.57"
+  echo "apt-cyg version 0.58"
   echo "Written by Stephen Jungels"
   echo ""
   echo "Copyright (c) 2005-9 Stephen Jungels.  Released under the GPL."
@@ -64,7 +64,6 @@ function version()
 function findworkspace()
 {
   # default working directory and mirror
-  
   mirror=ftp://mirror.mcs.anl.gov/pub/cygwin
   cache=/setup
   
@@ -95,14 +94,14 @@ function getsetup()
   then
     touch setup.ini
     mv setup.ini setup.ini-save
-    wget -N $mirror/setup.bz2
+    wget -N $mirror/$ARCH/setup.bz2
     if test -e setup.bz2 && test $? -eq 0
     then
       bunzip2 setup.bz2
       mv setup setup.ini
       echo Updated setup.ini
     else
-      wget -N $mirror/setup.ini
+      wget -N $mirror/$ARCH/setup.ini
       if test -e setup.ini && test $? -eq 0
       then
         echo Updated setup.ini
@@ -126,7 +125,6 @@ function checkpackages()
 
 
 # process options
-
 noscripts=0
 noupdate=0
 file=""

From 2f84a3f37db8a7cf830a456ec9443f93c009f5d1 Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Wed, 19 Feb 2014 19:42:24 +0000
Subject: [PATCH 10/12] Initial commit

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@24 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 LICENSE   | 20 ++++++++++++++++++++
 README.md |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..651bb7b
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Stephen Jungels
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e266462
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+apt-cyg
+=======
+
+Apt-cyg, an apt-get like tool for Cygwin

From 7c1cecba5a0d0bf47c7e554e6c4d73529937ac84 Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Wed, 19 Feb 2014 19:42:30 +0000
Subject: [PATCH 11/12] Update README.md

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@25 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 README.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e266462..10794c1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,26 @@
 apt-cyg
 =======
 
-Apt-cyg, an apt-get like tool for Cygwin
+apt-cyg is a command-line installer for Cygwin which cooperates with Cygwin Setup and uses the same repository. The syntax is similar to apt-get. Usage examples:
+
+* "apt-cyg install <package names>" to install packages
+* "apt-cyg remove <package names>" to remove packages
+* "apt-cyg update" to update setup.ini
+* "apt-cyg show" to show installed packages
+* "apt-cyg find <pattern(s)>" to find packages matching patterns
+* "apt-cyg describe <pattern(s)>" to describe packages matching patterns
+* "apt-cyg packageof <commands or files>" to locate parent packages 
+
+Quick start
+-----------
+
+apt-cyg is a simple script. Once you have a copy, make it executable:
+
+  # chmod +x /bin/apt-cyg
+
+Optionally place apt-cyg in a bin/ folder on your path.
+
+Then use apt-cyg, for example:
+
+  # apt-cyg install nano
+

From 37d6173a6e09d4d1b7512bcf6770078bfe397d50 Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Wed, 19 Feb 2014 19:42:35 +0000
Subject: [PATCH 12/12] Update README.md

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@26 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 10794c1..6e96d5a 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,9 @@ Then use apt-cyg, for example:
 
   # apt-cyg install nano
 
+Contributing
+------------
+
+This project has been re-published on GitHub to make contributing easier. Feel free to fork and modify this script.
+
+The [Google Code project](https://code.google.com/p/apt-cyg/) has a list of open issues.