Skip to content
This repository
Browse code

MINOR Updated 'from-source' installation to use new 'simple' theme (w…

…hich also fixes the problem of checking out 'blackcandy' sub themes via git into overlapping repository paths)
  • Loading branch information...
commit c56176c5d576b4e1c9b5739cf711fd437f5cc756 1 parent d0d23dc
Ingo Schommer authored

Showing 1 changed file with 7 additions and 8 deletions. Show diff stats Hide diff stats

  1. 15  docs/en/installation/from-source.md
15  docs/en/installation/from-source.md
Source Rendered
@@ -26,7 +26,7 @@ SilverStripe core is currently hosted on [github.com/silverstripe](http://github
26 26
  * The `installer` project ([github.com/silverstripe/silverstripe-installer](http://github.com/silverstripe/silverstripe-installer))
27 27
  * The `sapphire` module ([github.com/silverstripe/sapphire](http://github.com/silverstripe/sapphire))
28 28
  * The `cms` module ([github.com/silverstripe/silverstripe-cms](http://github.com/silverstripe/silverstripe-cms))
29  
- * A sample theme called `blackcandy` ([github.com/silverstripe-themes/silverstripe-blackcandy](http://github.com/silverstripe-themes/silverstripe-blackcandy))
  29
+ * A sample theme called `simple` ([github.com/silverstripe-themes/silverstripe-simple](http://github.com/silverstripe-themes/silverstripe-simple))
30 30
 
31 31
 First, you'll have to decide what you want to do with your project: 
32 32
 
@@ -72,7 +72,7 @@ Run the following command to download all core dependencies via [Piston](http://
72 72
 	cd my-silverstripe-project/
73 73
 	tools/new-project
74 74
 
75  
-This will add `sapphire`, `cms` and the `blackcandy` theme to your project.
  75
+This will add `sapphire`, `cms` and the `simple` theme to your project.
76 76
 
77 77
 As a fallback solution, you can simply download all necessary files without any dependency management through piston.
78 78
 This is handy if you have an existing project in version control, and want a one-off snapshot
@@ -146,8 +146,7 @@ Please replace `<username>` below with your github username.
146 146
 	cd my-silverstripe-project
147 147
 	git clone git@github.com:<username>/sapphire.git sapphire
148 148
 	git clone git@github.com:<username>/silverstripe-cms.git cms
149  
-	rm -rf themes
150  
-	git clone git@github.com:<username>/silverstripe-blackcandy.git themes
  149
+	git clone git@github.com:<username>/silverstripe-simple.git themes/simple
151 150
 
152 151
 Now you need to add the original repository as `upstream`, so you can keep your fork updated later on.
153 152
 
@@ -155,7 +154,7 @@ Now you need to add the original repository as `upstream`, so you can keep your
155 154
 	(git remote add upstream git://github.com/silverstripe/silverstripe-installer.git && git fetch upstream)
156 155
 	(cd sapphire && git remote add upstream git://github.com/silverstripe/sapphire.git && git fetch upstream)
157 156
 	(cd cms && git remote add upstream git://github.com/silverstripe/silverstripe-cms.git && git fetch upstream)
158  
-	(cd themes/blackcandy && git remote add upstream git://github.com/silverstripe-themes/silverstripe-blackcandy.git)
  157
+	(cd themes/simple && git remote add upstream git://github.com/silverstripe-themes/silverstripe-simple.git)
159 158
 
160 159
 Now that you're set up, please read our ["Collaboration on Git"](../misc/collaboration-on-git) guide,
161 160
 as well as our general ["Contributor guidelines"](../misc/contributing).
@@ -175,7 +174,7 @@ You can optionally select a ["release branch"](https://github.com/silverstripe/s
175 174
 	git checkout -b 2.4 origin/2.4
176 175
 	(cd sapphire && git checkout -b 2.4 origin/2.4)
177 176
 	(cd cms && git checkout -b 2.4 origin/2.4)
178  
-	(cd themes/blackcandy && git checkout -b 2.4 origin/2.4)
  177
+	(cd themes/simple && git checkout -b 2.4 origin/2.4)
179 178
 	# repeat for all modules in your project...
180 179
 
181 180
 After creating the local branch, you can simply switch between branches:
@@ -184,7 +183,7 @@ After creating the local branch, you can simply switch between branches:
184 183
 	git checkout 2.4
185 184
 	(cd sapphire && git checkout 2.4)
186 185
 	(cd cms && git checkout 2.4)
187  
-	(cd themes/blackcandy && git checkout 2.4)
  186
+	(cd themes/simple && git checkout 2.4)
188 187
 	# repeat for all modules in your project...
189 188
 
190 189
 To switch back to master:
@@ -193,7 +192,7 @@ To switch back to master:
193 192
 	git checkout master
194 193
 	(cd sapphire && git checkout master)
195 194
 	(cd cms && git checkout master)
196  
-	(cd themes/blackcandy && git checkout master)
  195
+	(cd themes/simple && git checkout master)
197 196
 	# repeat for all modules in your project...
198 197
 
199 198
 You can't switch branches if your working copy has local changes (typically in `mysite/_config.php`).

0 notes on commit c56176c

Please sign in to comment.
Something went wrong with that request. Please try again.