diff --git a/Git-1.7.8-preview20111206.exe b/Git-1.8.0-preview20121022.exe similarity index 61% rename from Git-1.7.8-preview20111206.exe rename to Git-1.8.0-preview20121022.exe index 4944026..cfd73d0 100644 Binary files a/Git-1.7.8-preview20111206.exe and b/Git-1.8.0-preview20121022.exe differ diff --git a/GitExtensions228SetupComplete.msi b/GitExtensions243SetupComplete.msi similarity index 74% rename from GitExtensions228SetupComplete.msi rename to GitExtensions243SetupComplete.msi index 34d2500..2ea50b9 100644 Binary files a/GitExtensions228SetupComplete.msi and b/GitExtensions243SetupComplete.msi differ diff --git a/Install.bat b/Install.bat index a2ea00e..368be8e 100644 --- a/Install.bat +++ b/Install.bat @@ -17,16 +17,15 @@ set /P email=Please enter your email address: rem Install Programs. echo. echo Installing Git... -start /w Git-1.7.8-preview20111206.exe /silent +start /w Git-1.8.0-preview20121022.exe /silent echo Installing GitExtensions... -start /w msiexec /I GitExtensions228SetupComplete.msi SSHCLIENT="OpenSSH" INSTALLMSYSGIT="0" INSTALLKDIFF3="0" ALLUSERS="1" /quiet /passive +start /w msiexec /I GitExtensions243SetupComplete.msi SSHCLIENT="OpenSSH" INSTALLMSYSGIT="0" INSTALLKDIFF3="0" ALLUSERS="1" /quiet /passive echo Installing KDiff3... -start /w KDiff3Setup_0.9.96.exe /S +start /w KDiff3-32bit-Setup_0.9.97.exe /S if "%platform%"=="x64" goto path64 goto path86 -rem ADD TO PATH (x64) :path64 set GITPATH=C:\Program Files (x86)\Git\bin goto :path @@ -44,30 +43,9 @@ rem SET GIT CONFIGURATION "%GITPATH%\git" config --global core.name %name% "%GITPATH%\git" config --global core.email %email% -rem CHECK FOR SSH KEY. IF NOT DETECTED, GENERATE. -if not exist "%HOMEDRIVE%%HOMEPATH%\.ssh\id_rsa" ( - mkdir "%HOMEDRIVE%%HOMEPATH%\.ssh" - "%GITPATH%\ssh-keygen.exe" -f "%HOMEDRIVE%%HOMEPATH%\.ssh\id_rsa" -t rsa -b 2048 -N '' -C "%name% <%email%>" >NUL -) - -clip < "%HOMEDRIVE%%HOMEPATH%\.ssh\id_rsa.pub" - -echo. -echo Your SSH key has been automatically generated and copied to your clipboard. -echo Click this window and then press any key to continue. Your web browser will open to UConn GitHub. -echo 1) Sign in if you have not already done so. -echo 2) Click "Account Settings" in the upper right corner of the page. -echo 3) Click "SSH Public Keys" on the left. -echo 4) Click "Add another public key". -echo 5) Paste (Control+V) into the "Key" box and Click "Add Key". -echo. - -pause -start http://github.uconn.edu/account/ssh - :finish echo. -echo Done! You can now close this window and start using Git / UConn GitHub. +echo Done! You can now close this window and start using Git and UConn GitHub. echo. pause >NUL \ No newline at end of file diff --git a/KDiff3Setup_0.9.96.exe b/KDiff3-32bit-Setup_0.9.97.exe similarity index 60% rename from KDiff3Setup_0.9.96.exe rename to KDiff3-32bit-Setup_0.9.97.exe index ef65f49..a194a24 100644 Binary files a/KDiff3Setup_0.9.96.exe and b/KDiff3-32bit-Setup_0.9.97.exe differ diff --git a/README.md b/README.md index 3656bf0..3e5d2fb 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ It currently does the following: * Installs Git Extensions (GUI, Visual Studio addons, etc) * Installs KDiff3 * Sets your Name and Email Git configuration values -* Generates a SSH key for you (if one does not already exist) -* Copies your SSH key to your clipboard so you can paste it into http://github.uconn.edu/account/ssh - ---------- diff --git a/UConnGitHub-v0.9.exe b/UConnGitHub-v0.9.exe deleted file mode 100644 index 760d8dc..0000000 Binary files a/UConnGitHub-v0.9.exe and /dev/null differ