Skip to content

Commit 3ebe4cd

Browse files
Pranav Kulshresthatabesin
Pranav Kulshrestha
authored andcommitted
This reverts unnecessary INSTALL variable (#438)
1 parent cec3574 commit 3ebe4cd

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

app.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ def index():
144144
features[name] = value
145145
recipe = json.dumps(variables, ensure_ascii=False) # Dumping the generator-packages into a JSON array
146146
feature = json.dumps(features, ensure_ascii=False) # Dumping the chosen features into a JSON objects
147-
INSTALL = request.form.getlist('INSTALL')
148147
wallpaper = request.files["desktop-wallpaper"]
149148
wallpaper_url = upload_wallpaper(wallpaper)
150149
logo = request.files["desktop-logo"]
@@ -159,7 +158,6 @@ def index():
159158
os.environ["recipe"] = recipe
160159
os.environ["processor"] = processor
161160
os.environ["feature"] = feature
162-
os.environ["INSTALL"] = INSTALL
163161
os.environ["wallpaper_url"] = wallpaper_url
164162
os.environ["logo_url"] = logo_url
165163
os.environ["theme"] = theme
@@ -173,7 +171,7 @@ def index():
173171
def output():
174172
if flag:
175173
if os.environ['TRAVIS_TAG']: # if TRAVIS_TAG have value it will proceed
176-
trigger_code = build.send_trigger_request(os.environ['email'], os.environ['TRAVIS_TAG'], os.environ['event_url'],os.environ['TRAVIS_SCRIPT'], os.environ['recipe'], os.environ['processor'], os.environ['feature'], os.environ['INSTALL'], os.environ['wallpaper_url'], os.environ["logo_url"], os.environ['theme'])
174+
trigger_code = build.send_trigger_request(os.environ['email'], os.environ['TRAVIS_TAG'], os.environ['event_url'],os.environ['TRAVIS_SCRIPT'], os.environ['recipe'], os.environ['processor'], os.environ['feature'], os.environ['wallpaper_url'], os.environ["logo_url"], os.environ['theme'])
177175
if trigger_code != 202:
178176
flash('Trigger failed, response code {}'.format(trigger_code)) #Display error if trigger fails
179177
return render_template('build.html')

templates/index.html

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,67 +148,61 @@ <h4>3rd Party Software</h4>
148148
<div class="right">
149149
<div class="input__less">
150150
<label class="checkbox">
151-
<input type="checkbox" value="chromium" name="INSTALL">
151+
<input type="checkbox" value="chromium" name="INSTALL_chromium">
152152
<span>Chromium</span>
153153
</label>
154154
</div>
155155
<div class="input__less">
156156
<label class="checkbox">
157-
<input type="checkbox" value="firefox" name="INSTALL">
157+
<input type="checkbox" value="firefox" name="INSTALL_firefox">
158158
<span>Firefox</span>
159159
</label>
160160
</div>
161161
<div class="input__less">
162162
<label class="checkbox">
163-
<input type="checkbox" value="chrome" name="INSTALL">
164-
<span>Chrome</span>
165-
</label>
166-
</div>
167-
<div class="input__less">
168-
<label class="checkbox">
169-
<input type="checkbox" value="hangout" name="INSTALL">
163+
<input type="checkbox" value="hangout" name="INSTALL_hangout">
170164
<span>Hangout</span>
171165
</label>
172166
</div>
173167
<div class="input__less">
174168
<label class="checkbox">
175-
<input type="checkbox" value="vlc" name="INSTALL">
169+
<input type="checkbox" value="vlc" name="INSTALL_vlc">
176170
<span>VLC</span>
177171
</label>
178172
</div>
179173
<div class="input__less">
180174
<label class="checkbox">
181-
<input type="checkbox" value="gimp" name="INSTALL">
175+
<input type="checkbox" value="gimp" name="INSTALL_gimp">
182176
<span>GIMP</span>
183177
</label>
184178
</div>
185179
<div class="input__less">
186180
<label class="checkbox">
187-
<input type="checkbox" value="inkspace" name="INSTALL">
181+
<input type="checkbox" value="inkspace" name="INSTALL_inkspace">
188182
<span>Inkscape</span>
189183
</label>
190184
</div>
191185
<div class="input__less">
192186
<label class="checkbox">
193-
<input type="checkbox" value="office" name="INSTALL">
187+
<input type="checkbox" value="office" name="INSTALL_office">
194188
<span>LibreOffice</span>
195189
</label>
196190
</div>
197191
<div class="input__less">
198192
<label class="checkbox">
199-
<input type="checkbox" value="git" name="INSTALL">
193+
<input type="checkbox" value="git" name="INSTALL_git">
200194
<span>Git</span>
201195
</label>
202196
</div>
203197
<div class="input__less">
204198
<label class="checkbox">
205-
<input type="checkbox" value="nextcloud" name="INSTALL">
199+
<input type="checkbox" value="nextcloud" name="INSTALL_nextcloud">
206200
<span>NextCloud</span>
207201
</label>
208202
</div>
209203
<div class="input__less">
210204
<label class="checkbox">
211-
<input type="checkbox" value="dropbox" name="INSTALL">
205+
<input type="checkbox" value="dropbox" name="INSTALL_dropbox">
212206
<span>Dropbox</span>
213207
</label>
214208
</div>

0 commit comments

Comments
 (0)