Skip to content

Commit 07f60b2

Browse files
committed
Remove unnecessary stdout/stderr redirects
1 parent 68fe69c commit 07f60b2

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

installer-jessie.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function do_help() {
104104
function do_native() {
105105
write_log "installing native libs"
106106
echo "Installing OpenCV and RXTX."
107-
apt-get install --yes --no-install-recommends $LIB_PKGS 2>&1 || return $?
107+
apt-get install --yes --no-install-recommends $LIB_PKGS || return $?
108108
}
109109

110110
###########################################
@@ -155,20 +155,20 @@ function java_install_jri() {
155155
done
156156
rm -rf "$JRI_DIR" || true
157157

158-
wget -nv "$JRI_URL" -O /tmp/jri.tar.gz 2>&1 || return $?
158+
wget -nv "$JRI_URL" -O /tmp/jri.tar.gz || return $?
159159
tar -C /tmp -xf /tmp/jri.tar.gz
160160
mv /tmp/jri "$JRI_DIR"
161161

162162
write_log "setting alternatives"
163163
for i in $(ls "$JRI_DIR/bin"); do
164-
update-alternatives --install "/usr/bin/$i" "$i" "$JRI_DIR/bin/$i" "$JRI_PRIORITY" 2>&1
164+
update-alternatives --install "/usr/bin/$i" "$i" "$JRI_DIR/bin/$i" "$JRI_PRIORITY"
165165
done
166166

167167
JAVA_REAL_EXE="$(which java)"
168168
CLASSLIST="$JRI_CLASSLIST"
169169

170170
write_log "dumping java cds"
171-
"$JAVA_REAL_EXE" -Xshare:dump 2>&1
171+
"$JAVA_REAL_EXE" -Xshare:dump
172172
return $?
173173
}
174174

@@ -185,10 +185,10 @@ function java_install_ppa() {
185185

186186
# add repo, update
187187
echo "$JDEB_REPO" | tee "/etc/apt/sources.list.d/jdk.list"
188-
apt-get update 2>&1 || return $?
188+
apt-get update || return $?
189189

190190
# install package
191-
apt-get install --yes --no-install-recommends -t "$JDEB_REPO_NAME" $JDEB_PKGS 2>&1 || return $?
191+
apt-get install --yes --no-install-recommends -t "$JDEB_REPO_NAME" $JDEB_PKGS || return $?
192192

193193
JAVA_REAL_EXE="$(which java)"
194194
}
@@ -201,7 +201,7 @@ function do_java_download() {
201201
echo "Downloading Java libraries..."
202202
rm -rf "$JAVA_LIBRARY_DIR"
203203
mkdir -p "$JAVA_LIBRARY_DIR"
204-
wget -nv -N -P "$JAVA_LIBRARY_DIR" $JAVA_LIBRARY_LIST 2>&1
204+
wget -nv -N -P "$JAVA_LIBRARY_DIR" $JAVA_LIBRARY_LIST
205205
return $?
206206
}
207207

@@ -216,7 +216,7 @@ function do_fixup_perms() {
216216
function print_java() {
217217
echo
218218
echo "-> Java version:"
219-
"$JAVA_REAL_EXE" -version 2>&1
219+
"$JAVA_REAL_EXE" -version
220220
}
221221

222222
# MAIN PROGRAM
@@ -231,7 +231,7 @@ if [ "$1" = "help" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
231231

232232
elif [ "$1" = "update" ]; then
233233
write_log "apt update"
234-
apt-get update 2>&1
234+
apt-get update
235235
exit $?
236236

237237
elif [ "$1" = "java" ]; then

installer.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function do_help() {
117117
function do_native() {
118118
write_log "installing native libs"
119119
echo "Installing OpenCV and RXTX."
120-
apt-get install --yes --no-install-recommends $LIB_PKGS 2>&1 || return $?
120+
apt-get install --yes --no-install-recommends $LIB_PKGS || return $?
121121
}
122122

123123
###########################################
@@ -163,7 +163,7 @@ function java_find() {
163163
function java_install_jri() {
164164
write_log "installing jri from ev3dev repo"
165165

166-
apt-get install --yes --no-install-recommends $JRI_PKGS 2>&1 || return $?
166+
apt-get install --yes --no-install-recommends $JRI_PKGS || return $?
167167

168168
JAVA_REAL_EXE="$(which java)"
169169
CLASSLIST="$JRI_CLASSLIST"
@@ -185,10 +185,10 @@ function java_install_ppa() {
185185

186186
# add repo, update
187187
echo "$JDEB_REPO" | tee "/etc/apt/sources.list.d/jdk.list"
188-
apt-get update 2>&1 || return $?
188+
apt-get update || return $?
189189

190190
# install package (the symlink above gets discarded, but it is needed during the installation)
191-
apt-get install --yes --no-install-recommends -t "$JDEB_REPO_NAME" $JDEB_PKGS 2>&1 || return $?
191+
apt-get install --yes --no-install-recommends -t "$JDEB_REPO_NAME" $JDEB_PKGS || return $?
192192

193193
JAVA_REAL_EXE="$(which java)"
194194
}
@@ -201,7 +201,7 @@ function do_java_download() {
201201
echo "Downloading Java libraries..."
202202
rm -rf "$JAVA_LIBRARY_DIR"
203203
mkdir -p "$JAVA_LIBRARY_DIR"
204-
wget -nv -N -P "$JAVA_LIBRARY_DIR" $JAVA_LIBRARY_LIST 2>&1
204+
wget -nv -N -P "$JAVA_LIBRARY_DIR" $JAVA_LIBRARY_LIST
205205
return $?
206206
}
207207

@@ -231,7 +231,7 @@ function do_fixup_perms() {
231231
function print_java() {
232232
echo
233233
echo "-> Java version:"
234-
"$JAVA_REAL_EXE" -version 2>&1
234+
"$JAVA_REAL_EXE" -version
235235
}
236236

237237
# MAIN PROGRAM
@@ -246,7 +246,7 @@ if [ "$1" = "help" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
246246

247247
elif [ "$1" = "update" ]; then
248248
write_log "apt update"
249-
apt-get update 2>&1
249+
apt-get update
250250
exit $?
251251

252252
elif [ "$1" = "java" ]; then

0 commit comments

Comments
 (0)